<!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>[13902] trunk/wp-includes/theme.php: Add blacklist to remove_theme_support(
).</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13902">13902</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-31 09:06:11 +0000 (Wed, 31 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add blacklist to remove_theme_support(). fixes <a href="http://trac.wordpress.org/ticket/12739">#12739</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 (13901 => 13902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-03-31 08:57:40 UTC (rev 13901)
+++ trunk/wp-includes/theme.php 2010-03-31 09:06:11 UTC (rev 13902)
</span><span class="lines">@@ -1531,7 +1531,9 @@
</span><span class="cx"> /**
</span><span class="cx"> * Allows a theme to register its support of a certain feature
</span><span class="cx"> *
</span><del>- * Must be called in the themes functions.php file to work.
</del><ins>+ * Must be called in the theme's functions.php file to work.
+ * If attached to a hook, it must be after_setup_theme.
+ * The init hook may be too late for some features.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> * @param string $feature the feature being added
</span><span class="lines">@@ -1548,15 +1550,25 @@
</span><span class="cx"> /**
</span><span class="cx"> * Allows a theme to de-register its support of a certain feature
</span><span class="cx"> *
</span><del>- * Must be called in the themes functions.php file to work.
</del><ins>+ * Should be called in the theme's functions.php file. Generally would
+ * be used for child themes to override support from the parent theme.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><ins>+ * @see add_theme_support()
</ins><span class="cx"> * @param string $feature the feature being added
</span><ins>+ * @return bool Whether feature was removed.
</ins><span class="cx"> */
</span><span class="cx"> function remove_theme_support( $feature ) {
</span><ins>+ // Blacklist: for internal registrations not used directly by themes.
+ if ( in_array( $feature, array( 'custom-background', 'custom-header', 'editor-style', 'widgets' ) ) )
+ return false;
+
</ins><span class="cx"> global $_wp_theme_features;
</span><span class="cx">
</span><del>- unset($_wp_theme_features[$feature]);
</del><ins>+ if ( ! isset( $_wp_theme_features[$feature] ) )
+ return false;
+ unset( $_wp_theme_features[$feature] );
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>