From 00056f8d717517b8881267b28c476fd50af3e831 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Mon, 6 Jun 2016 21:24:27 +0000
Subject: [PATCH] Template: Pass `$blog_id` to the `get_custom_logo` filter.

Props achbed, juanfra.
Fixes #36639.
Built from https://develop.svn.wordpress.org/trunk@37645


git-svn-id: http://core.svn.wordpress.org/trunk@37611 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/general-template.php | 6 ++++--
 wp-includes/version.php          | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index bb711fe5fd..6bcd79d0b8 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -903,10 +903,12 @@ function get_custom_logo( $blog_id = 0 ) {
 	 * Filters the custom logo output.
 	 *
 	 * @since 4.5.0
+	 * @since 4.6.0 Added the `$blog_id` parameter.
 	 *
-	 * @param string $html Custom logo HTML output.
+	 * @param string $html    Custom logo HTML output.
+	 * @param int    $blog_id ID of the blog to get the custom logo for.
 	 */
-	return apply_filters( 'get_custom_logo', $html );
+	return apply_filters( 'get_custom_logo', $html, $blog_id );
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8918b49315..566b4e88f9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37644';
+$wp_version = '4.6-alpha-37645';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.