Changeset 18325 for trunk/wp-includes/theme.php

Timestamp:

06/22/2011 07:09:23 PM (15 years ago)

Author:

ryan

Message:

Add theme support option for turning on random default headers. fixes #17832

File:

• trunk/wp-includes/theme.php (modified) (4 diffs)

trunk/wp-includes/theme.php

@@ -1461 +1461 @@
         if ( 'random-uploaded-image' == $header_image_mod )
                 $headers = get_uploaded_header_images();
-        elseif ( ! empty( $_wp_default_headers ) )
-                $headers = $_wp_default_headers;
+        elseif ( ! empty( $_wp_default_headers ) ) {
+                if ( 'random-default-image' == $header_image_mod ) {
+                        $headers = $_wp_default_headers;
+                } else {
+                        $is_random = get_theme_support( 'custom-header' );
+                        if ( isset( $is_random[ 0 ] ) && !empty( $is_random[ 0 ][ 'random-default' ] ) )
+                                $headers = $_wp_default_headers;
+                }
+        }
 
         if ( empty( $headers ) )
@@ -1477 +1484 @@
  *
  * Always true if user expressly chooses the option in Appearance > Header.
- * Also true if theme has multiple header images registered and no specific header image is chosen.
+ * Also true if theme has multiple header images registered, no specific header image
+ * is chosen, and theme turns on random headers with add_theme_support().
  *
  * @since 3.2.0
@@ -1495 +1503 @@
                 if ( "random-$type-image" == $header_image_mod )
                         return true;
-                elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image()  )
+                elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() )
                         return true;
         }
@@ -1558 +1566 @@
                 add_action('wp_head', $header_callback);
 
-        add_theme_support( 'custom-header', array( 'callback' => $header_callback ) );
+        $support = array( 'callback' => $header_callback );
+        $theme_support = get_theme_support( 'custom-header' );
+        if ( ! empty( $theme_support ) && is_array( $theme_support[ 0 ] ) )
+                $support = array_merge( $theme_support[ 0 ], $support );
+        add_theme_support( 'custom-header',  $support );
         add_theme_support( 'custom-header-uploads' );