vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-16 14:50:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@20162 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
2012-03-08 18:18:10 +00:00
parent d501284378
commit 9a484c5f35
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/class-wp-theme.php
+16 -5
View File
@@ -112,6 +112,14 @@ final class WP_Theme implements ArrayAccess {
*/
private $parent;
/**
* URL to the theme root, usually an absolute URL to wp-content/themes
*
* @access private
* var string
*/
private $theme_root_uri;
/**
* Flag for whether the theme's textdomain is loaded.
*
@@ -789,7 +797,11 @@ final class WP_Theme implements ArrayAccess {
/**
* 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
* @access public
@@ -797,10 +809,9 @@ final class WP_Theme implements ArrayAccess {
* @return string Theme root URI.
*/
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;
}
/**