<!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>[20231] trunk: Callbacks for custom headers and custom backgrounds registered through add_theme_support() are now wp-head-callback, admin-head-callback, and admin-preview-callback.</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, #logmsg > ol { margin-left: 0; 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/20231">20231</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-03-21 03:36:17 +0000 (Wed, 21 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Callbacks for custom headers and custom backgrounds registered through add_theme_support() are now wp-head-callback, admin-head-callback, and admin-preview-callback. see <a href="http://core.trac.wordpress.org/ticket/19910">#19910</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevenfunctionsphp">trunk/wp-content/themes/twentyeleven/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenfunctionsphp">trunk/wp-content/themes/twentyten/functions.php</a></li>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/functions.php (20230 => 20231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/functions.php 2012-03-21 03:21:07 UTC (rev 20230)
+++ trunk/wp-content/themes/twentyeleven/functions.php 2012-03-21 03:36:17 UTC (rev 20231)
</span><span class="lines">@@ -118,11 +118,11 @@
</span><span class="cx"> // Random image rotation by default.
</span><span class="cx"> 'random-default' => true,
</span><span class="cx"> // Callback for styling the header.
</span><del>- 'callback' => 'twentyeleven_header_style',
</del><ins>+ 'wp-head-callback' => 'twentyeleven_header_style',
</ins><span class="cx"> // Callback for styling the header preview in the admin.
</span><del>- 'admin-header-callback' => 'twentyeleven_admin_header_style',
</del><ins>+ 'admin-head-callback' => 'twentyeleven_admin_header_style',
</ins><span class="cx"> // Callback used to display the header preview in the admin.
</span><del>- 'admin-image-div-callback' => 'twentyeleven_admin_header_image',
</del><ins>+ 'admin-preview-callback' => 'twentyeleven_admin_header_image',
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // We'll be using post thumbnails for custom header images on posts and pages.
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/functions.php (20230 => 20231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php 2012-03-21 03:21:07 UTC (rev 20230)
+++ trunk/wp-content/themes/twentyten/functions.php 2012-03-21 03:36:17 UTC (rev 20231)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> // Don't support text inside the header image.
</span><span class="cx"> 'header-text' => false,
</span><span class="cx"> // Callback for styling the header preview in the admin.
</span><del>- 'admin-header-callback' => 'twentyten_admin_header_style',
</del><ins>+ 'admin-head-callback' => 'twentyten_admin_header_style',
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // We'll be using post thumbnails for custom header images on posts and pages.
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (20230 => 20231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2012-03-21 03:21:07 UTC (rev 20230)
+++ trunk/wp-includes/deprecated.php 2012-03-21 03:36:17 UTC (rev 20231)
</span><span class="lines">@@ -2990,16 +2990,16 @@
</span><span class="cx"> * @deprecated Use add_theme_support('custom-header', $args)
</span><span class="cx"> * @see add_theme_support()
</span><span class="cx"> *
</span><del>- * @param callback $callback Call on 'wp_head' action.
- * @param callback $admin_header_callback Call on custom header administration screen.
- * @param callback $admin_image_div_callback Output a custom header image div on the custom header administration screen. Optional.
</del><ins>+ * @param callback $wp_head_callback Call on 'wp_head' action.
+ * @param callback $admin_head_callback Call on custom header administration screen.
+ * @param callback $admin_preview_callback Output a custom header image div on the custom header administration screen. Optional.
</ins><span class="cx"> */
</span><del>-function add_custom_image_header( $callback, $admin_header_callback, $admin_image_div_callback = '' ) {
</del><ins>+function add_custom_image_header( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
</ins><span class="cx"> _deprecated_function( __FUNCTION__, '3.4', 'add_theme_support( \'custom-header\', $args )' );
</span><span class="cx"> return add_theme_support( 'custom-header', array(
</span><del>- 'callback' => $callback,
- 'admin-header-callback' => $admin_header_callback,
- 'admin-image-div-callback' => $admin_image_div_callback,
</del><ins>+ 'wp-head-callback' => $wp_head_callback,
+ 'admin-head-callback' => $admin_head_callback,
+ 'admin-preview-callback' => $admin_preview_callback,
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3021,25 +3021,22 @@
</span><span class="cx"> /**
</span><span class="cx"> * Add callbacks for background image display.
</span><span class="cx"> *
</span><del>- * The parameter $header_callback callback will be required to display the
- * content for the 'wp_head' action. The parameter $admin_header_callback
- * callback will be added to Custom_Background class and that will be added
- * to the 'admin_menu' action.
- *
</del><span class="cx"> * @since 3.0.0
</span><del>- * @uses Custom_Background Sets up for $admin_header_callback for administration panel display.
</del><ins>+ * @deprecated 3.4.0
+ * @deprecated Use add_theme_support('custom-background, $args)
+ * @see add_theme_support()
</ins><span class="cx"> *
</span><del>- * @param callback $callback Call on 'wp_head' action.
- * @param callback $admin_header_callback Call on custom background administration screen.
- * @param callback $admin_image_div_callback Output a custom background image div on the custom background administration screen. Optional.
</del><ins>+ * @param callback $wp_head_callback Call on 'wp_head' action.
+ * @param callback $admin_head_callback Call on custom background administration screen.
+ * @param callback $admin_preview_callback Output a custom background image div on the custom background administration screen. Optional.
</ins><span class="cx"> */
</span><del>-function add_custom_background( $callback = '', $admin_header_callback = '', $admin_image_div_callback = '' ) {
</del><ins>+function add_custom_background( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
</ins><span class="cx"> _deprecated_function( __FUNCTION__, '3.4', 'add_theme_support( \'custom-background\', $args )' );
</span><span class="cx">
</span><span class="cx"> return add_theme_support( 'custom-background', array(
</span><del>- 'callback' => $callback,
- 'admin-header-callback' => $admin_header_callback,
- 'admin-image-div-callback' => $admin_image_div_callback,
</del><ins>+ 'wp-head-callback' => $wp_head_callback,
+ 'admin-head-callback' => $admin_head_callback,
+ 'admin-preview-callback' => $admin_preview_callback,
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (20230 => 20231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2012-03-21 03:21:07 UTC (rev 20230)
+++ trunk/wp-includes/theme.php 2012-03-21 03:36:17 UTC (rev 20231)
</span><span class="lines">@@ -1296,9 +1296,9 @@
</span><span class="cx"> 'default-text-color' => '',
</span><span class="cx"> 'header-text' => true,
</span><span class="cx"> 'uploads' => true,
</span><del>- 'callback' => '',
- 'admin-header-callback' => '',
- 'admin-image-div-callback' => '',
</del><ins>+ 'wp-head-callback' => '',
+ 'admin-head-callback' => '',
+ 'admin-preview-callback' => '',
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $jit = isset( $args[0]['__jit'] );
</span><span class="lines">@@ -1366,9 +1366,9 @@
</span><span class="cx"> $defaults = array(
</span><span class="cx"> 'default-image' => '',
</span><span class="cx"> 'default-color' => '',
</span><del>- 'callback' => '',
- 'admin-header-callback' => '',
- 'admin-image-div-callback' => '',
</del><ins>+ 'wp-head-callback' => '_custom_background_cb',
+ 'admin-head-callback' => '',
+ 'admin-preview-callback' => '',
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $jit = isset( $args[0]['__jit'] );
</span><span class="lines">@@ -1391,9 +1391,6 @@
</span><span class="cx"> elseif ( isset( $args[0]['default-image'] ) || $jit )
</span><span class="cx"> define( 'BACKGROUND_IMAGE', $args[0]['default-image'] );
</span><span class="cx">
</span><del>- if ( empty( $args[0]['callback'] ) )
- $args[0]['callback'] = '_custom_background_cb';
-
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1414,12 +1411,12 @@
</span><span class="cx"> add_theme_support( 'custom-header', array( '__jit' => true ) );
</span><span class="cx">
</span><span class="cx"> $args = get_theme_support( 'custom-header' );
</span><del>- if ( $args[0]['callback'] )
- add_action( 'wp_head', $args[0]['callback'] );
</del><ins>+ if ( $args[0]['wp-head-callback'] )
+ add_action( 'wp_head', $args[0]['wp-head-callback'] );
</ins><span class="cx">
</span><span class="cx"> if ( is_admin() ) {
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/custom-header.php' );
</span><del>- $custom_image_header = new Custom_Image_Header( $args[0]['admin-header-callback'], $args[0]['admin-image-div-callback'] );
</del><ins>+ $custom_image_header = new Custom_Image_Header( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1428,11 +1425,11 @@
</span><span class="cx"> add_theme_support( 'custom-background', array( '__jit' => true ) );
</span><span class="cx">
</span><span class="cx"> $args = get_theme_support( 'custom-background' );
</span><del>- add_action( 'wp_head', $args[0]['callback'] );
</del><ins>+ add_action( 'wp_head', $args[0]['wp-head-callback'] );
</ins><span class="cx">
</span><span class="cx"> if ( is_admin() ) {
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/custom-background.php' );
</span><del>- $custom_background = new Custom_Background( $args[0]['admin-header-callback'], $args[0]['admin-image-div-callback'] );
</del><ins>+ $custom_background = new Custom_Background( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1509,15 +1506,15 @@
</span><span class="cx"> switch ( $feature ) {
</span><span class="cx"> case 'custom-header' :
</span><span class="cx"> $support = get_theme_support( 'custom-header' );
</span><del>- if ( $support[0]['callback'] )
- remove_action( 'wp_head', $support[0]['callback'] );
</del><ins>+ if ( $support[0]['wp-head-callback'] )
+ remove_action( 'wp_head', $support[0]['wp-head-callback'] );
</ins><span class="cx"> remove_action( 'admin_menu', array( $GLOBALS['custom_image_header'], 'init' ) );
</span><span class="cx"> unset( $GLOBALS['custom_image_header'] );
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'custom-background' :
</span><span class="cx"> $support = get_theme_support( 'custom-background' );
</span><del>- remove_action( 'wp_head', $support[0]['callback'] );
</del><ins>+ remove_action( 'wp_head', $support[0]['wp-head-callback'] );
</ins><span class="cx"> remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );
</span><span class="cx"> unset( $GLOBALS['custom_background'] );
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>