<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[27849] trunk/src: Custom Headers: Simplify and consolidate the querying of custom headers for the customizer.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27849">27849</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-03-29 10:52:17 +0000 (Sat, 29 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Custom Headers: Simplify and consolidate the querying of custom headers for the customizer.
props mcsf.
see <a href="http://core.trac.wordpress.org/ticket/21785">#21785</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincustomheaderphp">trunk/src/wp-admin/custom-header.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizecontrolphp">trunk/src/wp-includes/class-wp-customize-control.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/custom-header.php (27848 => 27849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/custom-header.php 2014-03-29 10:22:49 UTC (rev 27848)
+++ trunk/src/wp-admin/custom-header.php 2014-03-29 10:52:17 UTC (rev 27849)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span><del>- var $default_headers = array();
</del><ins>+ var $default_headers;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds custom headers uploaded by the user.
</span><span class="lines">@@ -254,6 +254,10 @@
</span><span class="cx"> if ( !isset($_wp_default_headers) )
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if ( is_array( $this->default_headers ) ) {
+ return;
+ }
+
</ins><span class="cx"> $this->default_headers = $_wp_default_headers;
</span><span class="cx"> $template_directory_uri = get_template_directory_uri();
</span><span class="cx"> $stylesheet_directory_uri = get_stylesheet_directory_uri();
</span><span class="lines">@@ -261,7 +265,6 @@
</span><span class="cx"> $this->default_headers[$header]['url'] = sprintf( $this->default_headers[$header]['url'], $template_directory_uri, $stylesheet_directory_uri );
</span><span class="cx"> $this->default_headers[$header]['thumbnail_url'] = sprintf( $this->default_headers[$header]['thumbnail_url'], $template_directory_uri, $stylesheet_directory_uri );
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1228,4 +1231,52 @@
</span><span class="cx"> $key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
</span><span class="cx"> update_post_meta( $attachment_id, $key, time() );
</span><span class="cx"> }
</span><ins>+
+ 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;
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizecontrolphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-customize-control.php (27848 => 27849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-customize-control.php 2014-03-29 10:22:49 UTC (rev 27848)
+++ trunk/src/wp-includes/class-wp-customize-control.php 2014-03-29 10:52:17 UTC (rev 27849)
</span><span class="lines">@@ -755,118 +755,6 @@
</span><span class="cx"> parent::enqueue();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- 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;
- }
-
</del><span class="cx"> public function prepare_control() {
</span><span class="cx"> global $custom_image_header;
</span><span class="cx"> if ( empty( $custom_image_header ) ) {
</span><span class="lines">@@ -875,8 +763,8 @@
</span><span class="cx">
</span><span class="cx"> // Process default headers and uploaded headers.
</span><span class="cx"> $custom_image_header->process_default_headers();
</span><del>- $this->default_headers = $this->get_default_header_images();
- $this->uploaded_headers = $this->get_uploaded_header_images();
</del><ins>+ $this->default_headers = $custom_image_header->get_default_header_images();
+ $this->uploaded_headers = $custom_image_header->get_uploaded_header_images();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function print_header_image_template() {
</span></span></pre>
</div>
</div>
</body>
</html>