<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16674] trunk/wp-includes/theme.php: Introduce remove_custom_image_header()
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16674">16674</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-02 00:16:35 +0000 (Thu, 02 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce remove_custom_image_header(). see <a href="http://trac.wordpress.org/ticket/14903">#14903</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (16673 => 16674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-12-01 22:12:09 UTC (rev 16673)
+++ trunk/wp-includes/theme.php 2010-12-02 00:16:35 UTC (rev 16674)
</span><span class="lines">@@ -1444,21 +1444,52 @@
</span><span class="cx"> * @param callback $admin_header_callback Call on custom header administration screen.
</span><span class="cx"> * @param callback $admin_image_div_callback Output a custom header image div on the custom header administration screen. Optional.
</span><span class="cx"> */
</span><del>-function add_custom_image_header($header_callback, $admin_header_callback, $admin_image_div_callback = '') {
- if ( ! empty($header_callback) )
</del><ins>+function add_custom_image_header( $header_callback, $admin_header_callback, $admin_image_div_callback = '' ) {
+ if ( ! empty( $header_callback ) )
</ins><span class="cx"> add_action('wp_head', $header_callback);
</span><span class="cx">
</span><del>- add_theme_support( 'custom-header' );
</del><ins>+ add_theme_support( 'custom-header', array( 'callback' => $header_callback ) );
</ins><span class="cx"> add_theme_support( 'custom-header-uploads' );
</span><span class="cx">
</span><span class="cx"> if ( ! is_admin() )
</span><span class="cx"> return;
</span><del>- require_once(ABSPATH . 'wp-admin/custom-header.php');
- $GLOBALS['custom_image_header'] =& new Custom_Image_Header($admin_header_callback, $admin_image_div_callback);
- add_action('admin_menu', array(&$GLOBALS['custom_image_header'], 'init'));
</del><ins>+
+ global $custom_image_header;
+
+ require_once( ABSPATH . 'wp-admin/custom-header.php' );
+ $custom_image_header = new Custom_Image_Header( $admin_header_callback, $admin_image_div_callback );
+ add_action( 'admin_menu', array( &$custom_image_header, 'init' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Remove image header support.
+ *
+ * @since 3.1.0
+ * @see add_custom_image_header()
+ *
+ * @return bool Whether support was removed.
+ */
+function remove_custom_image_header() {
+ if ( ! current_theme_supports( 'custom-header' ) )
+ return false;
+
+ $callback = get_theme_support( 'custom-header' );
+ remove_action( 'wp_head', $callback['callback'] );
+ _remove_theme_support( 'custom-header' );
+ remove_theme_support( 'custom-header-uploads' );
+
+ if ( ! is_admin() )
+ return;
+
+ global $custom_image_header;
+
+ remove_action( 'admin_menu', array( &$custom_image_header, 'init' ) );
+
+ unset( $GLOBALS['custom_image_header'] );
+ return true;
+}
+
+/**
</ins><span class="cx"> * Register a selection of default headers to be displayed by the custom header admin UI.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="lines">@@ -1694,7 +1725,16 @@
</span><span class="cx"> // Blacklist: for internal registrations not used directly by themes.
</span><span class="cx"> if ( in_array( $feature, array( 'custom-background', 'custom-header', 'editor-style', 'widgets', 'menus' ) ) )
</span><span class="cx"> return false;
</span><ins>+ return _remove_theme_support( $feature );
+}
</ins><span class="cx">
</span><ins>+/**
+ * Removes theme support internally, ignorant of the blacklist.
+ *
+ * @access private
+ * @since 3.1.0
+ */
+function _remove_theme_support( $feature ) {
</ins><span class="cx"> global $_wp_theme_features;
</span><span class="cx">
</span><span class="cx"> if ( ! isset( $_wp_theme_features[$feature] ) )
</span></span></pre>
</div>
</div>
</body>
</html>