Changeset 20162

Timestamp:

03/08/2012 06:18:10 PM (13 years ago)

Author:

nacin

Message:

Pass WP_Theme->get_theme_root_uri() to get_theme_root_uri(), thereby always triggering the theme_root_uri filter. see #20103.

Location:

trunk/wp-includes

Files:

• class-wp-theme.php (modified) (3 diffs)
• theme.php (modified) (1 diff)

trunk/wp-includes/class-wp-theme.php

@@ -112 +112 @@
      */
     private $parent;
+
+    /**
+     * URL to the theme root, usually an absolute URL to wp-content/themes
+     *
+     * @access private
+     * var string
+     */
+    private $theme_root_uri;
 
     /**
@@ -790 +798 @@
      * Returns the URL to the directory of the theme root.
      *
-     * This is typically the absolute path to wp-content/themes.
+     * 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.
+     *
+     * @uses get_theme_root_uri()
      *
      * @since 3.4.0
@@ -798 +810 @@
      */
     public function get_theme_root_uri() {
-        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 );
+        if ( ! isset( $this->theme_root_uri ) )
+            $this->theme_root_uri = get_theme_root_uri( $this->stylesheet, $this->theme_root );
+        return $this->theme_root_uri;
     }
 

trunk/wp-includes/theme.php

@@ -526 +526 @@
  * @since 1.5.0
  *
- * @param string $stylesheet_or_template The stylesheet or template name of the theme
+ * @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.
  * @return string Themes URI.
  */
-function get_theme_root_uri( $stylesheet_or_template = false ) {
+function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = false ) {
     global $wp_theme_directories;
 
-    if ( $stylesheet_or_template && $theme_root = get_raw_theme_root( $stylesheet_or_template ) ) {
+    if ( $stylesheet_or_template && ! $theme_root )
+        $theme_root = get_raw_theme_root( $stylesheet_or_template );
+
+    if ( $stylesheet_or_template && $theme_root ) {
         if ( in_array( $theme_root, (array) $wp_theme_directories ) ) {
             // Absolute path. Make an educated guess. YMMV -- but note the filter below.