<!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>[20162] trunk/wp-includes: Pass WP_Theme->get_theme_root_uri() to get_theme_root_uri(), thereby always triggering the theme_root_uri filter.</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/20162">20162</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-03-08 18:18:10 +0000 (Thu, 08 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass WP_Theme->get_theme_root_uri() to get_theme_root_uri(), thereby always triggering the theme_root_uri filter. see <a href="http://core.trac.wordpress.org/ticket/20103">#20103</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpthemephp">trunk/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-theme.php (20161 => 20162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-theme.php 2012-03-08 18:00:11 UTC (rev 20161)
+++ trunk/wp-includes/class-wp-theme.php 2012-03-08 18:18:10 UTC (rev 20162)
</span><span class="lines">@@ -113,6 +113,14 @@
</span><span class="cx"> private $parent;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * URL to the theme root, usually an absolute URL to wp-content/themes
+ *
+ * @access private
+ * var string
+ */
+ private $theme_root_uri;
+
+ /**
</ins><span class="cx"> * Flag for whether the theme's textdomain is loaded.
</span><span class="cx"> *
</span><span class="cx"> * @access private
</span><span class="lines">@@ -789,18 +797,21 @@
</span><span class="cx"> /**
</span><span class="cx"> * Returns the URL to the directory of the theme root.
</span><span class="cx"> *
</span><del>- * This is typically the absolute path to wp-content/themes.
</del><ins>+ * This is typically the absolute URL to wp-content/themes. This forms the basis
+ * for all other URLs returned by WP_Theme, so we pass it to the public function
+ * get_theme_root_uri() and allow it to run the theme_root_uri filter.
</ins><span class="cx"> *
</span><ins>+ * @uses get_theme_root_uri()
+ *
</ins><span class="cx"> * @since 3.4.0
</span><span class="cx"> * @access public
</span><span class="cx"> *
</span><span class="cx"> * @return string Theme root URI.
</span><span class="cx"> */
</span><span class="cx"> public function get_theme_root_uri() {
</span><del>- if ( 0 === strpos( WP_CONTENT_DIR, $this->theme_root ) )
- return str_replace( WP_CONTENT_DIR, content_url(), $this->theme_root );
- // Give up, send it off to the filter.
- return get_theme_root_uri( $this->stylesheet );
</del><ins>+ if ( ! isset( $this->theme_root_uri ) )
+ $this->theme_root_uri = get_theme_root_uri( $this->stylesheet, $this->theme_root );
+ return $this->theme_root_uri;
</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 (20161 => 20162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2012-03-08 18:00:11 UTC (rev 20161)
+++ trunk/wp-includes/theme.php 2012-03-08 18:18:10 UTC (rev 20162)
</span><span class="lines">@@ -525,13 +525,19 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> *
</span><del>- * @param string $stylesheet_or_template The stylesheet or template name of the theme
</del><ins>+ * @param string $stylesheet_or_template Optional. The stylesheet or template name of the theme.
+ * Default is to leverage the main theme root.
+ * @param string $theme_root Optional. The theme root for which calculations will be based, preventing
+ * the need for a get_raw_theme_root() call.
</ins><span class="cx"> * @return string Themes URI.
</span><span class="cx"> */
</span><del>-function get_theme_root_uri( $stylesheet_or_template = false ) {
</del><ins>+function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = false ) {
</ins><span class="cx"> global $wp_theme_directories;
</span><span class="cx">
</span><del>- if ( $stylesheet_or_template && $theme_root = get_raw_theme_root( $stylesheet_or_template ) ) {
</del><ins>+ if ( $stylesheet_or_template && ! $theme_root )
+ $theme_root = get_raw_theme_root( $stylesheet_or_template );
+
+ if ( $stylesheet_or_template && $theme_root ) {
</ins><span class="cx"> if ( in_array( $theme_root, (array) $wp_theme_directories ) ) {
</span><span class="cx"> // Absolute path. Make an educated guess. YMMV -- but note the filter below.
</span><span class="cx"> if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
</span></span></pre>
</div>
</div>
</body>
</html>