Changeset 18325

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

Location:

trunk

Files:

• wp-content/themes/twentyeleven/functions.php (modified) (2 diffs)
• wp-includes/theme.php (modified) (4 diffs)

trunk/wp-content/themes/twentyeleven/functions.php

@@ -110 +110 @@
     add_theme_support( 'post-thumbnails' );
 
-    // The next four constants set how twentyeleven supports custom headers
+    // The next four constants set how Twenty Eleven supports custom headers.
 
     // The default header text color
     define( 'HEADER_TEXTCOLOR', '000' );
 
-    // By leaving empty, we default to random image rotation
+    // By leaving empty, we allow for random image rotation.
     define( 'HEADER_IMAGE', '' );
 
@@ -131 +131 @@
     add_image_size( 'large-feature', HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true ); // Used for large feature (header) images
     add_image_size( 'small-feature', 500, 300 ); // Used for featured posts if a large-feature doesn't exist
+
+    // Turn on random header image rotation by default.
+    add_theme_support( 'custom-header', array( 'random-default' => true ) );
 
     // Add a way for the custom header to be styled in the admin panel that controls

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' );