Changeset 12043

Timestamp:

10/15/2009 08:45:32 PM (15 years ago)

Author:

westi

Message:

Restore the functionality of the theme_root filter. See #10467.

File:

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

trunk/wp-includes/theme.php

@@ -262 +262 @@
         return $wp_themes;
 
-    /* Register wp-content/themes as a theme directory */
-    register_theme_directory( 'themes' );
+    /* Register the default root as a theme directory */
+    register_theme_directory( get_theme_root() );
 
     if ( !$theme_files = search_theme_directories() )
@@ -494 +494 @@
 
 /**
- * Register a directory that contains themes relative to the content directory.
+ * Register a directory that contains themes.
  *
  * @since 2.9.0
  *
+ * @param string $directory Either the full filesystem path to a theme folder or a folder within WP_CONTENT_DIR
  * @return bool
  */
-function register_theme_directory( $directory ) {
+function register_theme_directory( $directory) {
     global $wp_theme_directories;
-
-    /* The theme directory should be relative to the content directory */
-    $registered_directory = WP_CONTENT_DIR . '/' . $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 ) )
@@ -524 +529 @@
 function search_theme_directories() {
     global $wp_theme_directories, $wp_broken_themes;
-
     if ( empty( $wp_theme_directories ) )
         return false;
@@ -610 +614 @@
  */
 function get_theme_root( $stylesheet_or_template = false ) {
-    $theme_roots = get_theme_roots();
-
-    if ( $theme_roots[$stylesheet_or_template] )
-        $theme_root = WP_CONTENT_DIR . '/' . $theme_roots[$stylesheet_or_template];
-    else
+    if ($stylesheet_or_template) {
+        $theme_roots = get_theme_roots();
+        
+        if ( $theme_roots[$stylesheet_or_template] )
+            $theme_root = WP_CONTENT_DIR . '/' . $theme_roots[$stylesheet_or_template];
+        else
+            $theme_root = WP_CONTENT_DIR . '/themes';
+    } else {
         $theme_root = WP_CONTENT_DIR . '/themes';
-
+    }
+    
     return apply_filters( 'theme_root', $theme_root );
 }