Changeset 20001

Timestamp:

02/28/2012 01:28:56 AM (13 years ago)

Author:

nacin

Message:

Always return an absolute path in get_raw_theme_root() and get_theme_roots().

These functions were changed in [15641] to avoid any calculations when only one theme directory is registered. However, the short-circuit ended up being relative to WP_CONTENT_DIR, rather than absolute. This broke situations where theme roots are outside the content directory (technically allowed), and made return values inconsistent, as when multiple roots were registered, absolute paths were always returned.

fixes #17597. see #20103. see #14911.

File:

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

trunk/wp-includes/theme.php

@@ -476 +476 @@
 
     if ( count($wp_theme_directories) <= 1 )
-        return '/themes';
+        return get_theme_root();
 
     $theme_roots = get_site_transient( 'theme_roots' );
@@ -548 +548 @@
  * @return bool
  */
-function register_theme_directory( $directory) {
+function register_theme_directory( $directory ) {
     global $wp_theme_directories;
 
-    /* If this folder does not exist, return and do not register */
-    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 */
-    if ( !file_exists( $registered_directory ) )
-        return false;
-
-    $wp_theme_directories[] = $registered_directory;
+    if ( ! file_exists( $directory ) ) {
+        // Try prepending as the theme directory could be relative to the content directory
+        $directory = WP_CONTENT_DIR . '/' . $directory;
+        // If this directory does not exist, return and do not register
+        if ( ! file_exists( $directory ) )
+            return false;
+    }
+
+    $wp_theme_directories[] = $directory;
 
     return true;
@@ -661 +658 @@
  */
 function get_theme_root( $stylesheet_or_template = false ) {
-    if ( $stylesheet_or_template ) {
-        if ( $theme_root = get_raw_theme_root($stylesheet_or_template) )
-            $theme_root = WP_CONTENT_DIR . $theme_root;
-        else
-            $theme_root = WP_CONTENT_DIR . '/themes';
-    } else {
+    if ( $stylesheet_or_template && $theme_root = get_raw_theme_root( $stylesheet_or_template ) )
+        $theme_root = $theme_root;
+    else
         $theme_root = WP_CONTENT_DIR . '/themes';
-    }
 
     return apply_filters( 'theme_root', $theme_root );
@@ -686 +679 @@
     if ( $stylesheet_or_template ) {
         if ( $theme_root = get_raw_theme_root($stylesheet_or_template) )
-            $theme_root_uri = content_url( $theme_root );
+            $theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );
         else
             $theme_root_uri = content_url( 'themes' );
@@ -697 +690 @@
 
 /**
- * Get the raw theme root relative to the content directory with no filters applied.
+ * Get the raw theme root with no filters applied.
  *
  * @since 3.1.0
+ *
+ * Before 3.4.0, this incorrectly returned a path relative to the content directory ("/themes") when
+ * only one theme directory was registered. Absolute paths are now always returned.
  *
  * @param string $stylesheet_or_template The stylesheet or template name of the theme
@@ -708 +704 @@
 
     if ( count($wp_theme_directories) <= 1 )
-        return '/themes';
+        return WP_CONTENT_DIR . '/themes';
 
     $theme_root = false;