Changeset 20118

Timestamp:

03/06/2012 01:50:54 AM (11 years ago)

Author:

nacin

Message:

Store relative-to-wp-content theme roots, as that is what get_theme_roots() should be receiving. see #20103.

Since search_theme_directories() now generates this and leverages this as a cache, convert absolute to relative on cache storage, and relative to absolute on cache retrieval.

File:

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

trunk/wp-includes/theme.php

@@ -399 +399 @@
     $found_themes = array();
 
+    // Set up maybe-relative, maybe-absolute array of theme directories.
+    // We always want to return absolute, but we need to cache relative
+    // use in for get_theme_root().
+    foreach ( $wp_theme_directories as $theme_root ) {
+        if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
+            $relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;
+        else
+            $relative_theme_roots[ $theme_root ] = $theme_root;
+    }
+
     if ( $cache_expiration = apply_filters( 'wp_cache_themes_persistently', false, 'search_theme_directories' ) ) {
         $cached_roots = get_site_transient( 'theme_roots' );
@@ -405 +415 @@
                 $found_themes[ $theme_dir ] = array(
                     'theme_file' => $theme_dir . '/style.css',
-                    'theme_root' => $theme_root,
+                    'theme_root' => $relative_theme_roots[ $theme_root ], // Convert relative to absolute.
                 );
             }
@@ -466 +476 @@
 
     $theme_roots = array();
+    $relative_theme_roots = array_flip( $relative_theme_roots );
+
     foreach ( $found_themes as $theme_dir => $theme_data ) {
-        $theme_roots[ $theme_dir ] = $theme_data['theme_root'];
+        $theme_roots[ $theme_dir ] = $relative_theme_roots[ $theme_data['theme_root'] ]; // Convert absolute to relative.
     }