Changeset 20162 for trunk/wp-includes/class-wp-theme.php

Timestamp:

03/08/2012 06:18:10 PM (14 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.

File:

• trunk/wp-includes/class-wp-theme.php (modified) (3 diffs)

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;
     }