sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Twenty Eleven trumps it's pretenders. Fixes #17841

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@18322 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2011-06-20 03:07:24 +00:00
parent 6a82127a91
commit e1af5b5cb2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/theme.php
View File

@ -396,12 +396,14 @@ function get_themes() {
// Check for theme name collision. This occurs if a theme is copied to // Check for theme name collision. This occurs if a theme is copied to
// a new theme directory and the theme header is not updated. Whichever // a new theme directory and the theme header is not updated. Whichever
// theme is first keeps the name. Subsequent themes get a suffix applied. // theme is first keeps the name. Subsequent themes get a suffix applied.
// The Twenty Ten, Default and Classic themes always trump their pretenders. // The Twenty Eleven, Twenty Ten, Default and Classic themes always trump
// their pretenders.
if ( isset($wp_themes[$name]) ) { if ( isset($wp_themes[$name]) ) {
$trump_cards = array( $trump_cards = array(
'classic' => 'WordPress Classic', 'classic' => 'WordPress Classic',
'default' => 'WordPress Default', 'default' => 'WordPress Default',
'twentyten' => 'Twenty Ten', 'twentyten' => 'Twenty Ten',
'twentyeleven' => 'Twenty Eleven',
); );
if ( isset( $trump_cards[ $stylesheet ] ) && $name == $trump_cards[ $stylesheet ] ) { if ( isset( $trump_cards[ $stylesheet ] ) && $name == $trump_cards[ $stylesheet ] ) {
// If another theme has claimed to be one of our default themes, move // If another theme has claimed to be one of our default themes, move