Changeset 16424

Timestamp:

11/17/2010 04:11:44 PM (16 years ago)

Author:

ryan

Message:

Register the default theme dir in wp-settings.php so that it is registered even when get_themes() doesn't run. Fix counting of theme dirs. Add option to get_raw_theme_root() to disregard the current theme root cache. see #14911

Location:

trunk

Files:

• wp-includes/theme.php (modified) (5 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/theme.php

@@ -267 +267 @@
         if ( isset($wp_themes) )
                 return $wp_themes;
-
-        /* Register the default root as a theme directory */
-        register_theme_directory( get_theme_root() );
 
         if ( !$theme_files = search_theme_directories() )
@@ -476 +473 @@
         global $wp_theme_directories;
 
-        if ( count($wp_theme_directories <= 1) )
+        if ( count($wp_theme_directories) <= 1 )
                 return '/themes';
 
@@ -704 +701 @@
  * @return string Theme root
  */
-function get_raw_theme_root( $stylesheet_or_template ) {
+function get_raw_theme_root( $stylesheet_or_template, $no_cache = false ) {
         global $wp_theme_directories;
 
-        if ( count($wp_theme_directories <= 1) )
+        if ( count($wp_theme_directories) <= 1 )
                 return '/themes';
 
@@ -713 +710 @@
 
         // If requesting the root for the current theme, consult options to avoid calling get_theme_roots()
-        if ( get_option('stylesheet') == $stylesheet_or_template )
-                $theme_root = get_option('stylesheet_root');
-        elseif ( get_option('template') == $stylesheet_or_template )
-                $theme_root = get_option('template_root');
+        if ( !$no_cache ) {
+                if ( get_option('stylesheet') == $stylesheet_or_template )
+                        $theme_root = get_option('stylesheet_root');
+                elseif ( get_option('template') == $stylesheet_or_template )
+                        $theme_root = get_option('template_root');
+        }
 
         if ( empty($theme_root) ) {
@@ -1249 +1248 @@
         update_option('stylesheet', $stylesheet);
         if ( count($wp_theme_directories) > 1 ) {
-                update_option('template_root', get_raw_theme_root($template));
-                update_option('stylesheet_root', get_raw_theme_root($stylesheet));
+                update_option('template_root', get_raw_theme_root($template, true));
+                update_option('stylesheet_root', get_raw_theme_root($stylesheet, true));
         }
         delete_option('current_theme');

trunk/wp-settings.php

@@ -175 +175 @@
 create_initial_post_types();
 
+// Register the default theme directory root
+register_theme_directory( get_theme_root() );
+
 // Load active plugins.
 foreach ( wp_get_active_and_valid_plugins() as $plugin )