Changeset 20015

Timestamp:

02/28/2012 04:22:26 PM (15 years ago)

Author:

nacin

Message:

Revert [20001]. Theme roots that are passed around, stored, and cached can be valid as absolute paths or paths relative to wp-content. We'll have to patch this elsewhere. see #17597.

File:

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

trunk/wp-includes/theme.php

@@ -476 +476 @@
 
         if ( count($wp_theme_directories) <= 1 )
-                return get_theme_root();
+                return '/themes';
 
         $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 ( ! 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;
+        /* 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;
 
         return true;
@@ -658 +661 @@
  */
 function get_theme_root( $stylesheet_or_template = false ) {
-        if ( $stylesheet_or_template && $theme_root = get_raw_theme_root( $stylesheet_or_template ) )
-                $theme_root = $theme_root;
-        else
+        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 {
                 $theme_root = WP_CONTENT_DIR . '/themes';
+        }
 
         return apply_filters( 'theme_root', $theme_root );
@@ -679 +686 @@
         if ( $stylesheet_or_template ) {
                 if ( $theme_root = get_raw_theme_root($stylesheet_or_template) )
-                        $theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );
+                        $theme_root_uri = content_url( $theme_root );
                 else
                         $theme_root_uri = content_url( 'themes' );
@@ -690 +697 @@
 
 /**
- * Get the raw theme root with no filters applied.
+ * Get the raw theme root relative to the content directory 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
@@ -704 +708 @@
 
         if ( count($wp_theme_directories) <= 1 )
-                return WP_CONTENT_DIR . '/themes';
+                return '/themes';
 
         $theme_root = false;