<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[36838] trunk/src: Customize: Rename custom logo classes after [36837].</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/36838">36838</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/36838","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-03-03 19:58:37 +0000 (Thu, 03 Mar 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Customize: Rename custom logo classes after <a href="https://core.trac.wordpress.org/changeset/36837">[36837]</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/35945">#35945</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesadminphp">trunk/src/wp-admin/includes/admin.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpcustomlogophp">trunk/src/wp-admin/includes/class-wp-custom-logo.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizecustomlogocontrolphp">trunk/src/wp-includes/customize/class-wp-customize-custom-logo-control.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpsitelogophp">trunk/src/wp-admin/includes/class-wp-site-logo.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizesitelogocontrolphp">trunk/src/wp-includes/customize/class-wp-customize-site-logo-control.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/admin.php 2016-03-03 19:55:15 UTC (rev 36837)
+++ trunk/src/wp-admin/includes/admin.php 2016-03-03 19:58:37 UTC (rev 36838)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once(ABSPATH . 'wp-admin/includes/class-wp-site-icon.php');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** WordPress Custom Logo API */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-require_once(ABSPATH . 'wp-admin/includes/class-wp-site-logo.php');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require_once(ABSPATH . 'wp-admin/includes/class-wp-custom-logo.php');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** WordPress Update Administration API */
</span><span class="cx" style="display: block; padding: 0 10px"> require_once(ABSPATH . 'wp-admin/includes/update.php');
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpcustomlogophpfromrev36837trunksrcwpadminincludesclasswpsitelogophp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-admin/includes/class-wp-custom-logo.php (from rev 36837, trunk/src/wp-admin/includes/class-wp-site-logo.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-custom-logo.php (rev 0)
+++ trunk/src/wp-admin/includes/class-wp-custom-logo.php 2016-03-03 19:58:37 UTC (rev 36838)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,138 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Administration API: WP_Custom_Logo class
+ *
+ * @package WordPress
+ * @subpackage Administration
+ * @since 4.5.0
+ */
+
+/**
+ * Core class used to implement custom logo functionality.
+ *
+ * @since 4.5.0
+ */
+class WP_Custom_Logo {
+
+ /**
+ * Get current logo settings stored in theme mod.
+ *
+ * @since 4.5.0
+ * @access public
+ */
+ public function __construct() {
+ add_action( 'wp_head', array( $this, 'head_text_styles' ) );
+ add_action( 'delete_attachment', array( $this, 'delete_attachment_data' ) );
+ add_filter( 'image_size_names_choose', array( $this, 'media_manager_image_sizes' ) );
+ }
+
+ /**
+ * Hides header text on the front end if necessary.
+ *
+ * @since 4.5.0
+ * @access public
+ */
+ public function head_text_styles() {
+ // Bail if our theme supports custom headers.
+ if ( current_theme_supports( 'custom-header' ) || get_theme_mod( 'custom_logo_header_text', true ) ) {
+ return;
+ }
+
+ // Is Display Header Text unchecked? If so, hide the header text.
+ ?>
+ <!-- Custom Logo: hide header text -->
+ <style type="text/css">
+ <?php echo sanitize_html_class( $this->header_text_classes() ); ?> {
+ position: absolute;
+ clip: rect(1px, 1px, 1px, 1px);
+ }
+ </style>
+ <?php
+ }
+
+ /**
+ * Reset the custom logo if the current logo is deleted in the media manager.
+ *
+ * @since 4.5.0
+ * @access public
+ *
+ * @param int $post_id Post ID.
+ */
+ public function delete_attachment_data( $post_id ) {
+ $custom_logo_id = get_theme_mod( 'custom_logo' );
+
+ if ( $custom_logo_id && $custom_logo_id == $post_id ) {
+ remove_theme_mod( 'custom_logo' );
+ }
+ }
+
+ /**
+ * Makes custom image sizes available to the media manager.
+ *
+ * @since 4.5.0
+ * @access public
+ *
+ * @param array $sizes Image sizes.
+ * @return array All default and registered custom image sizes.
+ */
+ public function media_manager_image_sizes( $sizes ) {
+
+ // Get an array of all registered image sizes.
+ $intermediate = get_intermediate_image_sizes();
+
+ // Is there anything fun to work with?
+ if ( is_array( $intermediate ) && ! empty( $intermediate ) ) {
+ foreach ( $intermediate as $key => $size ) {
+
+ // If the size isn't already in the $sizes array, add it.
+ if ( ! array_key_exists( $size, $sizes ) ) {
+ $sizes[ $size ] = $size;
+ }
+ }
+ }
+
+ return $sizes;
+ }
+
+ /**
+ * Retrieves the header text classes.
+ *
+ * If not defined in add_theme_support(), defaults from Underscores will be used.
+ *
+ * @since 4.5.0
+ * @access protected
+ *
+ * @return string String of classes to hide.
+ */
+ protected function header_text_classes() {
+ $args = get_theme_support( 'custom-logo' );
+
+ if ( isset( $args[0]['header-text'] ) ) {
+ // Use any classes defined in add_theme_support().
+ $classes = $args[0]['header-text'];
+ } else {
+ // Otherwise, use these defaults, which will work with any Underscores-based theme.
+ $classes = array(
+ 'site-title',
+ 'site-description',
+ );
+ }
+
+ // If there's an array of classes, reduce them to a string for output.
+ if ( is_array( $classes ) ) {
+ $classes = array_map( 'sanitize_html_class', $classes );
+ $classes = (string) '.' . implode( ', .', $classes );
+ } else {
+ $classes = (string) '.' . $classes;
+ }
+
+ return $classes;
+ }
+}
+
+/**
+ * WP_Custom_Logo instance.
+ *
+ * @global WP_Custom_Logo $wp_custom_logo
+ */
+$GLOBALS['wp_custom_logo'] = new WP_Custom_Logo;
</ins></span></pre></div>
<a id="trunksrcwpadminincludesclasswpsitelogophp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-admin/includes/class-wp-site-logo.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-logo.php 2016-03-03 19:55:15 UTC (rev 36837)
+++ trunk/src/wp-admin/includes/class-wp-site-logo.php 2016-03-03 19:58:37 UTC (rev 36838)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,138 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Administration API: WP_Custom_Logo class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 4.5.0
- */
-
-/**
- * Core class used to implement custom logo functionality.
- *
- * @since 4.5.0
- */
-class WP_Custom_Logo {
-
- /**
- * Get current logo settings stored in theme mod.
- *
- * @since 4.5.0
- * @access public
- */
- public function __construct() {
- add_action( 'wp_head', array( $this, 'head_text_styles' ) );
- add_action( 'delete_attachment', array( $this, 'delete_attachment_data' ) );
- add_filter( 'image_size_names_choose', array( $this, 'media_manager_image_sizes' ) );
- }
-
- /**
- * Hides header text on the front end if necessary.
- *
- * @since 4.5.0
- * @access public
- */
- public function head_text_styles() {
- // Bail if our theme supports custom headers.
- if ( current_theme_supports( 'custom-header' ) || get_theme_mod( 'custom_logo_header_text', true ) ) {
- return;
- }
-
- // Is Display Header Text unchecked? If so, hide the header text.
- ?>
- <!-- Custom Logo: hide header text -->
- <style type="text/css">
- <?php echo sanitize_html_class( $this->header_text_classes() ); ?> {
- position: absolute;
- clip: rect(1px, 1px, 1px, 1px);
- }
- </style>
- <?php
- }
-
- /**
- * Reset the custom logo if the current logo is deleted in the media manager.
- *
- * @since 4.5.0
- * @access public
- *
- * @param int $post_id Post ID.
- */
- public function delete_attachment_data( $post_id ) {
- $custom_logo_id = get_theme_mod( 'custom_logo' );
-
- if ( $custom_logo_id && $custom_logo_id == $post_id ) {
- remove_theme_mod( 'custom_logo' );
- }
- }
-
- /**
- * Makes custom image sizes available to the media manager.
- *
- * @since 4.5.0
- * @access public
- *
- * @param array $sizes Image sizes.
- * @return array All default and registered custom image sizes.
- */
- public function media_manager_image_sizes( $sizes ) {
-
- // Get an array of all registered image sizes.
- $intermediate = get_intermediate_image_sizes();
-
- // Is there anything fun to work with?
- if ( is_array( $intermediate ) && ! empty( $intermediate ) ) {
- foreach ( $intermediate as $key => $size ) {
-
- // If the size isn't already in the $sizes array, add it.
- if ( ! array_key_exists( $size, $sizes ) ) {
- $sizes[ $size ] = $size;
- }
- }
- }
-
- return $sizes;
- }
-
- /**
- * Retrieves the header text classes.
- *
- * If not defined in add_theme_support(), defaults from Underscores will be used.
- *
- * @since 4.5.0
- * @access protected
- *
- * @return string String of classes to hide.
- */
- protected function header_text_classes() {
- $args = get_theme_support( 'custom-logo' );
-
- if ( isset( $args[0]['header-text'] ) ) {
- // Use any classes defined in add_theme_support().
- $classes = $args[0]['header-text'];
- } else {
- // Otherwise, use these defaults, which will work with any Underscores-based theme.
- $classes = array(
- 'site-title',
- 'site-description',
- );
- }
-
- // If there's an array of classes, reduce them to a string for output.
- if ( is_array( $classes ) ) {
- $classes = array_map( 'sanitize_html_class', $classes );
- $classes = (string) '.' . implode( ', .', $classes );
- } else {
- $classes = (string) '.' . $classes;
- }
-
- return $classes;
- }
-}
-
-/**
- * WP_Custom_Logo instance.
- *
- * @global WP_Custom_Logo $wp_custom_logo
- */
-$GLOBALS['wp_custom_logo'] = new WP_Custom_Logo;
</del></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2016-03-03 19:55:15 UTC (rev 36837)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2016-03-03 19:58:37 UTC (rev 36838)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +217,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-control.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-logo-control.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once( ABSPATH . WPINC . '/customize/class-wp-customize-custom-logo-control.php' );
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . WPINC . '/customize/class-wp-widget-area-customize-control.php' );
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizecustomlogocontrolphpfromrev36837trunksrcwpincludescustomizeclasswpcustomizesitelogocontrolphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/customize/class-wp-customize-custom-logo-control.php (from rev 36837, trunk/src/wp-includes/customize/class-wp-customize-site-logo-control.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-custom-logo-control.php (rev 0)
+++ trunk/src/wp-includes/customize/class-wp-customize-custom-logo-control.php 2016-03-03 19:58:37 UTC (rev 36838)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,53 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Customize API: WP_Customize_Custom_Logo_Control class
+ *
+ * @package WordPress
+ * @subpackage Customize
+ * @since 4.5.0
+ */
+
+/**
+ * Customize custom logo control class.
+ *
+ * Used only for custom functionality in JavaScript.
+ *
+ * @since 4.5.0
+ *
+ * @see WP_Customize_Image_Control
+ */
+class WP_Customize_Custom_Logo_Control extends WP_Customize_Image_Control {
+
+ /**
+ * Control type.
+ *
+ * @since 4.5.0
+ * @access public
+ * @var string
+ */
+ public $type = 'custom_logo';
+
+ /**
+ * Constructor.
+ *
+ * @since 4.5.0
+ * @access public
+ *
+ * @param WP_Customize_Manager $manager Customizer bootstrap instance.
+ * @param string $id Control ID.
+ * @param array $args Optional. Arguments to override class property defaults.
+ */
+ public function __construct( $manager, $id, $args = array() ) {
+ parent::__construct( $manager, $id, $args );
+
+ $this->button_labels = array(
+ 'select' => __( 'Select logo' ),
+ 'change' => __( 'Change logo' ),
+ 'remove' => __( 'Remove' ),
+ 'default' => __( 'Default' ),
+ 'placeholder' => __( 'No logo selected' ),
+ 'frame_title' => __( 'Select logo' ),
+ 'frame_button' => __( 'Choose logo' ),
+ );
+ }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizesitelogocontrolphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/customize/class-wp-customize-site-logo-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-site-logo-control.php 2016-03-03 19:55:15 UTC (rev 36837)
+++ trunk/src/wp-includes/customize/class-wp-customize-site-logo-control.php 2016-03-03 19:58:37 UTC (rev 36838)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,53 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Customize API: WP_Customize_Custom_Logo_Control class
- *
- * @package WordPress
- * @subpackage Customize
- * @since 4.5.0
- */
-
-/**
- * Customize custom logo control class.
- *
- * Used only for custom functionality in JavaScript.
- *
- * @since 4.5.0
- *
- * @see WP_Customize_Image_Control
- */
-class WP_Customize_Custom_Logo_Control extends WP_Customize_Image_Control {
-
- /**
- * Control type.
- *
- * @since 4.5.0
- * @access public
- * @var string
- */
- public $type = 'custom_logo';
-
- /**
- * Constructor.
- *
- * @since 4.5.0
- * @access public
- *
- * @param WP_Customize_Manager $manager Customizer bootstrap instance.
- * @param string $id Control ID.
- * @param array $args Optional. Arguments to override class property defaults.
- */
- public function __construct( $manager, $id, $args = array() ) {
- parent::__construct( $manager, $id, $args );
-
- $this->button_labels = array(
- 'select' => __( 'Select logo' ),
- 'change' => __( 'Change logo' ),
- 'remove' => __( 'Remove' ),
- 'default' => __( 'Default' ),
- 'placeholder' => __( 'No logo selected' ),
- 'frame_title' => __( 'Select logo' ),
- 'frame_button' => __( 'Choose logo' ),
- );
- }
-}
</del></span></pre>
</div>
</div>
</body>
</html>