From 2de2e623373617c1e346165f85e88fcb86fcdb6d Mon Sep 17 00:00:00 2001 From: dd32 Date: Mon, 20 Jun 2011 03:07:24 +0000 Subject: [PATCH] Twenty Eleven trumps it's pretenders. Fixes #17841 git-svn-id: http://svn.automattic.com/wordpress/trunk@18322 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/theme.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/wp-includes/theme.php b/wp-includes/theme.php index a5e99a981..a5d6150a2 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -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