Changeset 20119

Timestamp:

03/06/2012 01:59:50 AM (15 years ago)

Author:

nacin

Message:

Default themes always trump their pretenders. Even though we are no longer keying by name, it is not a good experience to see multiple 'WordPress Default' themes when one was copied and had the directory renamed. This also keeps with the behavior of get_themes() (and the deprecated return value). see #20103.

Allow a default theme within a directory of wp-content/themes (e.g. 'somedir/twentyeleven') to be identified as a default theme.

File:

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

trunk/wp-includes/class-wp-theme.php

@@ -28 +28 @@
                 'TextDomain'  => 'Text Domain',
                 'DomainPath'  => 'Domain Path',
+        );
+
+        /**
+         * Default themes.
+         *
+         * @static
+         * @access private
+         * @var array
+         */
+        private static $default_themes = array(
+                'classic'      => 'WordPress Classic',
+                'default'      => 'WordPress Default',
+                'twentyten'    => 'Twenty Ten',
+                'twentyeleven' => 'Twenty Eleven',
         );
 
@@ -177 +191 @@
                 } else {
                         $this->headers = get_file_data( $this->theme_root . '/' . $theme_file, self::$file_headers, 'theme' );
+                        // Default themes always trump their pretenders.
+                        // Properly identify default themes that are inside a directory within wp-content/themes.
+                        if ( $default_theme_slug = array_search( $this->headers['Name'], self::$default_themes ) ) {
+                                if ( basename( $this->stylesheet ) != $default_theme_slug )
+                                        $this->headers['Name'] .= '/' . $this->stylesheet;
+                        }
                 }
 
@@ -208 +228 @@
                         }
                 }
-
-                // @TODO Check for theme name collision. But guess what? We don't care anymore! We only care about clashing matches found in search_theme_directories().
 
                 // Set the parent, if we're a child theme.