Changeset 15720

Timestamp:

10/04/2010 07:50:13 PM (14 years ago)

Author:

nacin

Message:

Account for Twenty Ten in theme name collisions and properly fall back to TT in get_current_theme(). fixes #15719, props tonyf12.

File:

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

trunk/wp-includes/theme.php

@@ -400 +400 @@
         // a new theme directory and the theme header is not updated.  Whichever
         // theme is first keeps the name.  Subsequent themes get a suffix applied.
-        // The Default and Classic themes always trump their pretenders.
+        // The Twenty Ten, Default and Classic themes always trump their pretenders.
         if ( isset($wp_themes[$name]) ) {
-            if ( ('WordPress Default' == $name || 'WordPress Classic' == $name) &&
-                     ('default' == $stylesheet || 'classic' == $stylesheet) ) {
+            $trump_cards = array(
+                'classic'   => 'WordPress Classic',
+                'default'   => 'WordPress Default',
+                'twentyten' => 'Twenty Ten',
+            );
+            if ( isset( $trump_cards[ $stylesheet ] ) && $name == $trump_cards[ $stylesheet ] ) {
                 // If another theme has claimed to be one of our default themes, move
                 // them aside.
@@ -519 +523 @@
     $current_template = get_option('template');
     $current_stylesheet = get_option('stylesheet');
-    $current_theme = 'WordPress Default';
+    $current_theme = 'Twenty Ten';
 
     if ( $themes ) {