Changeset 19969

Timestamp:

02/21/2012 05:39:05 PM (13 years ago)

Author:

nacin

Message:

Twenty Twelve always trumps its pretenders. see #19978.

File:

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

trunk/wp-includes/theme.php

@@ -397 +397 @@
         // 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 Twenty Eleven, Twenty Ten, Default and Classic themes always trump
-        // their pretenders.
+        // Default themes themes always trump their pretenders.
         if ( isset($wp_themes[$name]) ) {
             $trump_cards = array(
@@ -405 +404 @@
                 'twentyten'    => 'Twenty Ten',
                 'twentyeleven' => 'Twenty Eleven',
+                'twentytwelve' => 'Twenty Twelve',
             );
             if ( isset( $trump_cards[ $stylesheet ] ) && $name == $trump_cards[ $stylesheet ] ) {