Changeset 27849

Timestamp:

03/29/2014 10:52:17 AM (11 years ago)

Author:

nacin

Message:

Custom Headers: Simplify and consolidate the querying of custom headers for the customizer.

props mcsf.
see #21785.

Location:

trunk/src

Files:

• wp-admin/custom-header.php (modified) (4 diffs)
• wp-includes/class-wp-customize-control.php (modified) (2 diffs)

trunk/src/wp-admin/custom-header.php

@@ -41 +41 @@
      * @access private
      */
-    var $default_headers = array();
+    var $default_headers;
 
     /**
@@ -255 +255 @@
             return;
 
+        if ( is_array( $this->default_headers ) ) {
+            return;
+        }
+
         $this->default_headers = $_wp_default_headers;
         $template_directory_uri = get_template_directory_uri();
@@ -262 +266 @@
             $this->default_headers[$header]['thumbnail_url'] =  sprintf( $this->default_headers[$header]['thumbnail_url'], $template_directory_uri, $stylesheet_directory_uri );
         }
-
     }
 
@@ -1229 +1232 @@
         update_post_meta( $attachment_id, $key, time() );
     }
+
+    public function get_default_header_images() {
+        $this->process_default_headers();
+
+        // Get the default image if there is one.
+        $default = get_theme_support( 'custom-header', 'default-image' );
+
+        if ( ! $default ) { // If not,
+            return $this->default_headers; // easy peasy.
+        }
+
+        $default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+        $already_has_default = false;
+
+        foreach ( $this->default_headers as $k => $h ) {
+            if ( $h['url'] === $default ) {
+                $already_has_default = true;
+                break;
+            }
+        }
+
+        if ( $already_has_default ) {
+            return $this->default_headers;
+        }
+
+        // If the one true image isn't included in the default set, prepend it.
+        $header_images = array();
+        $header_images['default'] = array(
+            'url'           => $default,
+            'thumbnail_url' => $default,
+            'description'   => 'Default'
+        );
+
+        // The rest of the set comes after.
+        $header_images = array_merge( $header_images, $this->default_headers );
+        return $header_images;
+    }
+
+    public function get_uploaded_header_images() {
+        $header_images = get_uploaded_header_images();
+        $timestamp_key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
+
+        foreach ( $header_images as &$header_image ) {
+            $header_image['timestamp'] = get_post_meta( $header_image['attachment_id'], $timestamp_key, true );
+        }
+
+        return $header_images;
+    }
 }

trunk/src/wp-includes/class-wp-customize-control.php

@@ -756 +756 @@
     }
 
-    public function get_default_header_images() {
-        global $custom_image_header;
-
-        // Get *the* default image if there is one
-        $default = get_theme_support( 'custom-header', 'default-image' );
-
-        if ( ! $default ) { // If not,
-            return $custom_image_header->default_headers; // easy peasy.
-        }
-
-        $default = sprintf( $default,
-            get_template_directory_uri(),
-            get_stylesheet_directory_uri() );
-
-        $header_images = array();
-        $already_has_default = false;
-
-        // Get the whole set of default images
-        $default_header_images = $custom_image_header->default_headers;
-        foreach ( $default_header_images as $k => $h ) {
-            if ( $h['url'] == $default ) {
-                $already_has_default = true;
-                break;
-            }
-        }
-
-        // If *the one true image* isn't included in the default set, add it in
-        // first position
-        if ( ! $already_has_default ) {
-            $header_images['default'] = array(
-                'url' => $default,
-                'thumbnail_url' => $default,
-                'description' => 'Default'
-            );
-        }
-
-        // The rest of the set comes after
-        $header_images = array_merge( $header_images, $default_header_images );
-
-        return $header_images;
-    }
-
-    public function get_uploaded_header_images() {
-        $key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
-        $header_images = array();
-
-        $headers_not_dated = get_posts( array(
-            'post_type' => 'attachment',
-            'meta_key' => '_wp_attachment_is_custom_header',
-            'meta_value' => get_option('stylesheet'),
-            'orderby' => 'none',
-            'nopaging' => true,
-            'meta_query' => array(
-                array(
-                    'key' => '_wp_attachment_is_custom_header',
-                    'value' => get_option( 'stylesheet' ),
-                    'compare' => 'LIKE'
-                ),
-                array(
-                    'key' => $key,
-                    'value' => 'this string must not be empty',
-                    'compare' => 'NOT EXISTS'
-                ),
-            )
-        ) );
-
-        $headers_dated = get_posts( array(
-            'post_type' => 'attachment',
-            'meta_key' => $key,
-            'orderby' => 'meta_value_num',
-            'order' => 'DESC',
-            'nopaging' => true,
-            'meta_query' => array(
-                array(
-                    'key' => '_wp_attachment_is_custom_header',
-                    'value' => get_option( 'stylesheet' ),
-                    'compare' => 'LIKE'
-                ),
-            ),
-        ) );
-
-        $limit = apply_filters( 'custom_header_uploaded_limit', 15 );
-        $headers = array_merge( $headers_dated, $headers_not_dated );
-        $headers = array_slice( $headers, 0, $limit );
-
-        foreach ( (array) $headers as $header ) {
-            $url = esc_url_raw( $header->guid );
-            $header_data = wp_get_attachment_metadata( $header->ID );
-            $timestamp = get_post_meta( $header->ID,
-                '_wp_attachment_custom_header_last_used_' . get_stylesheet(),
-                true );
-
-            $h = array(
-                'attachment_id' => $header->ID,
-                'url'           => $url,
-                'thumbnail_url' => $url,
-                'timestamp'     => $timestamp ? $timestamp : 0,
-            );
-
-            if ( isset( $header_data['width'] ) ) {
-                $h['width'] = $header_data['width'];
-            }
-            if ( isset( $header_data['height'] ) ) {
-                $h['height'] = $header_data['height'];
-            }
-
-            $header_images[] = $h;
-        }
-
-        return $header_images;
-    }
-
     public function prepare_control() {
         global $custom_image_header;
@@ -876 +764 @@
         // Process default headers and uploaded headers.
         $custom_image_header->process_default_headers();
-        $this->default_headers = $this->get_default_header_images();
-        $this->uploaded_headers = $this->get_uploaded_header_images();
+        $this->default_headers = $custom_image_header->get_default_header_images();
+        $this->uploaded_headers = $custom_image_header->get_uploaded_header_images();
     }