Changes from trunk/wp-includes/theme.php at r18325 to branches/3.1/wp-includes/theme.php at r18018

File:

• branches/3.1/wp-includes/theme.php (modified) (10 diffs)

branches/3.1/wp-includes/theme.php

@@ -80 +80 @@
 function get_stylesheet_uri() {
     $stylesheet_dir_uri = get_stylesheet_directory_uri();
-    $stylesheet_uri = $stylesheet_dir_uri . '/style.css';
+    $stylesheet_uri = $stylesheet_dir_uri . "/style.css";
     return apply_filters('stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri);
 }
@@ -397 +397 @@
         // a new theme directory and the theme header is not updated.  Whichever
         // theme is first keeps the name.  Subsequent themes get a suffix applied.
-        // The Twenty Eleven, Twenty Ten, Default and Classic themes always trump
-        // their pretenders.
+        // The Twenty Ten, Default and Classic themes always trump their pretenders.
         if ( isset($wp_themes[$name]) ) {
             $trump_cards = array(
-                'classic'      => 'WordPress Classic',
-                'default'      => 'WordPress Default',
-                'twentyten'    => 'Twenty Ten',
-                'twentyeleven' => 'Twenty Eleven',
+                'classic'   => 'WordPress Classic',
+                'default'   => 'WordPress Default',
+                'twentyten' => 'Twenty Ten',
             );
             if ( isset( $trump_cards[ $stylesheet ] ) && $name == $trump_cards[ $stylesheet ] ) {
@@ -830 +828 @@
     $templates[] = "category-{$category->slug}.php";
     $templates[] = "category-{$category->term_id}.php";
-    $templates[] = 'category.php';
+    $templates[] = "category.php";
 
     return get_query_template( 'category', $templates );
@@ -854 +852 @@
     $templates[] = "tag-{$tag->slug}.php";
     $templates[] = "tag-{$tag->term_id}.php";
-    $templates[] = 'tag.php';
+    $templates[] = "tag.php";
 
     return get_query_template( 'tag', $templates );
@@ -884 +882 @@
     $templates[] = "taxonomy-$taxonomy-{$term->slug}.php";
     $templates[] = "taxonomy-$taxonomy.php";
-    $templates[] = 'taxonomy.php';
+    $templates[] = "taxonomy.php";
 
     return get_query_template( 'taxonomy', $templates );
@@ -966 +964 @@
     if ( $id )
         $templates[] = "page-$id.php";
-    $templates[] = 'page.php';
+    $templates[] = "page.php";
 
     return get_query_template( 'page', $templates );
@@ -1430 +1428 @@
 function get_header_image() {
     $default = defined( 'HEADER_IMAGE' ) ? HEADER_IMAGE : '';
+
     $url = get_theme_mod( 'header_image', $default );
-
-    if ( 'remove-header' == $url )
-        return false;
-
-    if ( is_random_header_image() )
-        $url = get_random_header_image();
 
     if ( is_ssl() )
@@ -1447 +1440 @@
 
 /**
- * Get random header image from registered images in theme.
- *
- * @since 3.2.0
- *
- * @return string Path to header image
- */
-function get_random_header_image() {
-    global $_wp_default_headers;
-
-    $header_image_mod = get_theme_mod( 'header_image', '' );
-    $headers = array();
-
-    if ( 'random-uploaded-image' == $header_image_mod )
-        $headers = get_uploaded_header_images();
-    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 ) )
-        return '';
-
-    $random_image = array_rand( $headers );
-    $header_url = sprintf( $headers[$random_image]['url'], get_template_directory_uri(), get_stylesheet_directory_uri() );
-
-    return $header_url;
-}
-
-/**
- * Check if random header image is in use.
- *
- * Always true if user expressly chooses the option in Appearance > Header.
- * 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
- * @uses HEADER_IMAGE
- *
- * @param string $type The random pool to use. any|default|uploaded
- * @return boolean
- */
-function is_random_header_image( $type = 'any' ) {
-    $default = defined( 'HEADER_IMAGE' ) ? HEADER_IMAGE : '';
-    $header_image_mod = get_theme_mod( 'header_image', $default );
-
-    if ( 'any' == $type ) {
-        if ( 'random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ( '' != get_random_header_image() && empty( $header_image_mod ) ) )
-            return true;
-    } else {
-        if ( "random-$type-image" == $header_image_mod )
-            return true;
-        elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() )
-            return true;
-    }
-
-    return false;
-}
-
-/**
  * Display header image path.
  *
@@ -1517 +1446 @@
 function header_image() {
     echo get_header_image();
-}
-
-/**
- * Get the header images uploaded for the current theme.
- *
- * @since 3.2.0
- *
- * @return array
- */
-function get_uploaded_header_images() {
-    $header_images = array();
-
-    // @todo caching
-    $headers = get_posts( array( 'post_type' => 'attachment', 'meta_key' => '_wp_attachment_is_custom_header', 'meta_value' => get_option('stylesheet'), 'orderby' => 'none', 'nopaging' => true ) );
-
-    if ( empty( $headers ) )
-        return array();
-
-    foreach ( (array) $headers as $header ) {
-        $url = esc_url_raw( $header->guid );
-        $header = basename($url);
-        $header_images[$header] = array();
-        $header_images[$header]['url'] =  $url;
-        $header_images[$header]['thumbnail_url'] =  $url;
-        $header_images[$header]['uploaded'] = true;
-    }
-
-    return $header_images;
 }
 
@@ -1566 +1467 @@
         add_action('wp_head', $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', array( 'callback' => $header_callback ) );
     add_theme_support( 'custom-header-uploads' );