From db47a4913ca550da030439b6d14169671ff20cc2 Mon Sep 17 00:00:00 2001
From: Konstantin Obenland <obenland@automattic.com>
Date: Wed, 30 Mar 2016 17:20:27 +0000
Subject: [PATCH] Template: Remove `$size` reference from `get_custom_logo()`.

Argument was removed in [37077] in favor of `with` and `height` arguments.

Props ocean90.
Fixes #36327.


Built from https://develop.svn.wordpress.org/trunk@37135


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

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 2ba72a38f3..aaff39ef20 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -876,29 +876,22 @@ function get_custom_logo( $blog_id = 0 ) {
 	}
 
 	$custom_logo_id = get_theme_mod( 'custom_logo' );
-	$size           = get_theme_support( 'custom-logo', 'size' );
-
-	if ( ! $size ) {
-		$size = 'full';
-	}
 
 	// We have a logo. Logo is go.
 	if ( $custom_logo_id ) {
 		$html = sprintf( '<a href="%1$s" class="custom-logo-link" rel="home" itemprop="url">%2$s</a>',
 			esc_url( home_url( '/' ) ),
-			wp_get_attachment_image( $custom_logo_id, $size, false, array(
-				'class'     => "custom-logo attachment-$size",
-				'data-size' => $size,
-				'itemprop'  => 'logo',
+			wp_get_attachment_image( $custom_logo_id, 'full', false, array(
+				'class'    => 'custom-logo',
+				'itemprop' => 'logo',
 			) )
 		);
 	}
 
 	// If no logo is set but we're in the Customizer, leave a placeholder (needed for the live preview).
 	elseif ( is_customize_preview() ) {
-		$html = sprintf( '<a href="%1$s" class="custom-logo-link" style="display:none;"><img class="custom-logo" data-size="%2$s" /></a>',
-			esc_url( home_url( '/' ) ),
-			esc_attr( $size )
+		$html = sprintf( '<a href="%1$s" class="custom-logo-link" style="display:none;"><img class="custom-logo"/></a>',
+			esc_url( home_url( '/' ) )
 		);
 	}
 
@@ -912,9 +905,8 @@ function get_custom_logo( $blog_id = 0 ) {
 	 * @since 4.5.0
 	 *
 	 * @param string $html Custom logo HTML output.
-	 * @param string $size Size specified in add_theme_support declaration, or 'full' default.
 	 */
-	return apply_filters( 'get_custom_logo', $html, $size );
+	return apply_filters( 'get_custom_logo', $html );
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 262217baa8..b31925b86b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-RC1-37133';
+$wp_version = '4.5-RC1-37135';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.