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:
parent
55ddb508e1
commit
2de2e62337
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue