<!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>[13923] trunk/wp-content/themes/twentyten/functions.php:
Restore pluggable for twentyten_setup().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13923">13923</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-02 00:54:48 +0000 (Fri, 02 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Restore pluggable for twentyten_setup(). Its impossible for child themes to override without using a callback to remove the filter at a higher priority. Props jorbin. Fixes <a href="http://trac.wordpress.org/ticket/12806">#12806</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenfunctionsphp">trunk/wp-content/themes/twentyten/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/functions.php (13922 => 13923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php 2010-04-02 00:07:59 UTC (rev 13922)
+++ trunk/wp-content/themes/twentyten/functions.php 2010-04-02 00:54:48 UTC (rev 13923)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> /** Tell WordPress to run twentyten_setup() when the 'after_setup_theme' hook is run. */
</span><span class="cx"> add_action( 'after_setup_theme', 'twentyten_setup' );
</span><span class="cx">
</span><ins>+if ( ! function_exists('twentyten_setup') ):
</ins><span class="cx"> /**
</span><span class="cx"> * Sets up theme defaults and registers support for various WordPress features.
</span><span class="cx"> *
</span><span class="lines">@@ -60,8 +61,8 @@
</span><span class="cx"> * before the init hook. The init hook is too late for some features, such as indicating
</span><span class="cx"> * support post thumbnails.
</span><span class="cx"> *
</span><del>- * To override twentyten_setup() in a child theme, remove the action hook and add your own
- * function tied to the after_setup_theme hook.
</del><ins>+ * To override twentyten_setup() in a child theme, add your own twentyten_setup to your child theme's
+ * functions.php file.
</ins><span class="cx"> *
</span><span class="cx"> * @uses add_theme_support() To add support for post thumbnails, navigation menus, and automatic feed links.
</span><span class="cx"> * @uses add_custom_background() To add support for a custom background.
</span><span class="lines">@@ -166,6 +167,7 @@
</span><span class="cx"> )
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><ins>+endif;
</ins><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'twentyten_admin_header_style' ) ) :
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>