<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[12043] trunk/wp-includes/theme.php:
Restore the functionality of the theme_root filter.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12043">12043</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-10-15 20:45:32 +0000 (Thu, 15 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Restore the functionality of the theme_root filter. See <a href="http://trac.wordpress.org/ticket/10467">#10467</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 (12042 => 12043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2009-10-15 20:26:21 UTC (rev 12042)
+++ trunk/wp-includes/theme.php 2009-10-15 20:45:32 UTC (rev 12043)
</span><span class="lines">@@ -261,8 +261,8 @@
</span><span class="cx"> if ( isset($wp_themes) )
</span><span class="cx"> return $wp_themes;
</span><span class="cx">
</span><del>- /* Register wp-content/themes as a theme directory */
- register_theme_directory( 'themes' );
</del><ins>+ /* Register the default root as a theme directory */
+ register_theme_directory( get_theme_root() );
</ins><span class="cx">
</span><span class="cx"> if ( !$theme_files = search_theme_directories() )
</span><span class="cx"> return false;
</span><span class="lines">@@ -493,19 +493,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Register a directory that contains themes relative to the content directory.
</del><ins>+ * Register a directory that contains themes.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> *
</span><ins>+ * @param string $directory Either the full filesystem path to a theme folder or a folder within WP_CONTENT_DIR
</ins><span class="cx"> * @return bool
</span><span class="cx"> */
</span><del>-function register_theme_directory( $directory ) {
</del><ins>+function register_theme_directory( $directory) {
</ins><span class="cx"> global $wp_theme_directories;
</span><del>-
- /* The theme directory should be relative to the content directory */
- $registered_directory = WP_CONTENT_DIR . '/' . $directory;
-
</del><ins>+
</ins><span class="cx"> /* If this folder does not exist, return and do not register */
</span><ins>+ if ( !file_exists( $directory ) )
+ /* Try prepending as the theme directory could be relative to the content directory */
+ $registered_directory = WP_CONTENT_DIR . '/' . $directory;
+ else
+ $registered_directory = $directory;
+
+ /* If this folder does not exist, return and do not register */
</ins><span class="cx"> if ( !file_exists( $registered_directory ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -523,7 +528,6 @@
</span><span class="cx"> */
</span><span class="cx"> function search_theme_directories() {
</span><span class="cx"> global $wp_theme_directories, $wp_broken_themes;
</span><del>-
</del><span class="cx"> if ( empty( $wp_theme_directories ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -609,13 +613,17 @@
</span><span class="cx"> * @return string Theme path.
</span><span class="cx"> */
</span><span class="cx"> function get_theme_root( $stylesheet_or_template = false ) {
</span><del>- $theme_roots = get_theme_roots();
-
- if ( $theme_roots[$stylesheet_or_template] )
- $theme_root = WP_CONTENT_DIR . '/' . $theme_roots[$stylesheet_or_template];
- else
</del><ins>+ if ($stylesheet_or_template) {
+ $theme_roots = get_theme_roots();
+
+ if ( $theme_roots[$stylesheet_or_template] )
+ $theme_root = WP_CONTENT_DIR . '/' . $theme_roots[$stylesheet_or_template];
+ else
+ $theme_root = WP_CONTENT_DIR . '/themes';
+ } else {
</ins><span class="cx"> $theme_root = WP_CONTENT_DIR . '/themes';
</span><del>-
</del><ins>+ }
+
</ins><span class="cx"> return apply_filters( 'theme_root', $theme_root );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>