Changeset 36837 for trunk/src/wp-includes/general-template.php

Timestamp:

03/03/2016 07:55:15 PM (9 years ago)

Author:

obenland

Message:

Customize: Site logos are custom logos.

Brings the nomenclature closer to custom headers and backgrounds.

See ​https://wordpress.slack.com/archives/core/p1456955151003150
See #35945.

File:

• trunk/src/wp-includes/general-template.php (modified) (6 diffs)

trunk/src/wp-includes/general-template.php

@@ -840 +840 @@
 
 /**
- * Whether the site has a Site Logo.
+ * Whether the site has a custom logo.
  *
  * @since 4.5.0
  *
  * @param int $blog_id Optional. ID of the blog in question. Default current blog.
- * @return bool Whether the site has a site logo or not.
- */
-function has_site_logo( $blog_id = 0 ) {
+ * @return bool Whether the site has a custom logo or not.
+ */
+function has_custom_logo( $blog_id = 0 ) {
     if ( is_multisite() && (int) $blog_id !== get_current_blog_id() ) {
         switch_to_blog( $blog_id );
     }
 
-    $site_logo_id = get_theme_mod( 'site_logo' );
+    $custom_logo_id = get_theme_mod( 'custom_logo' );
 
     if ( is_multisite() && ms_is_switched() ) {
@@ -858 +858 @@
     }
 
-    return (bool) $site_logo_id;
-}
-
-/**
- * Returns a Site Logo, linked to home.
+    return (bool) $custom_logo_id;
+}
+
+/**
+ * Returns a custom logo, linked to home.
  *
  * @since 4.5.0
  *
  * @param int $blog_id Optional. ID of the blog in question. Default current blog.
- * @return string Site logo markup.
- */
-function get_the_site_logo( $blog_id = 0 ) {
+ * @return string Custom logo markup.
+ */
+function get_custom_logo( $blog_id = 0 ) {
     $html = '';
 
@@ -876 +876 @@
     }
 
-    $site_logo_id = get_theme_mod( 'site_logo' );
+    $custom_logo_id = get_theme_mod( 'custom_logo' );
 
     if ( is_multisite() && ms_is_switched() ) {
         restore_current_blog();
     }
-    $size = get_theme_support( 'site-logo' );
+    $size = get_theme_support( 'custom-logo' );
     $size = $size[0]['size'];
 
     // We have a logo. Logo is go.
-    if ( $site_logo_id ) {
-        $html = sprintf( '<a href="%1$s" class="site-logo-link" rel="home" itemprop="url">%2$s</a>',
+    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( $site_logo_id, $size, false, array(
-                'class'     => "site-logo attachment-$size",
+            wp_get_attachment_image( $custom_logo_id, $size, false, array(
+                'class'     => "custom-logo attachment-$size",
                 'data-size' => $size,
                 'itemprop'  => 'logo',
@@ -898 +898 @@
     // 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="site-logo-link" style="display:none;"><img class="site-logo" data-size="%2$s" /></a>',
+        $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 )
@@ -905 +905 @@
 
     /**
-     * Filter the Site Logo output.
+     * Filter the custom logo output.
      *
      * @since 4.5.0
      *
-     * @param string $html Site Logo HTML output.
+     * @param string $html Custom logo HTML output.
      * @param string $size Size specified in add_theme_support declaration, or 'thumbnail' default.
      */
-    return apply_filters( 'get_the_site_logo', $html, $size );
-}
-
-/**
- * Displays a Site Logo, linked to home.
+    return apply_filters( 'get_custom_logo', $html, $size );
+}
+
+/**
+ * Displays a custom logo, linked to home.
  *
  * @since 4.5.0
@@ -922 +922 @@
  * @param int $blog_id Optional. ID of the blog in question. Default current blog.
  */
-function the_site_logo( $blog_id = 0 ) {
-    echo get_the_site_logo( $blog_id );
+function the_custom_logo( $blog_id = 0 ) {
+    echo get_custom_logo( $blog_id );
 }