WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Twenty Eleven trumps it's pretenders. Fixes #17841 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18322 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2011-06-20 03:07:24 +00:00
parent 55ddb508e1
commit 2de2e62337
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
// 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 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]) ) {
$trump_cards = array(
'classic' => 'WordPress Classic',
'default' => 'WordPress Default',
'twentyten' => 'Twenty Ten',
'classic' => 'WordPress Classic',
'default' => 'WordPress Default',
'twentyten' => 'Twenty Ten',
'twentyeleven' => 'Twenty Eleven',
);
if ( isset( $trump_cards[ $stylesheet ] ) && $name == $trump_cards[ $stylesheet ] ) {
// If another theme has claimed to be one of our default themes, move