Changeset 2568

Timestamp:

04/21/2005 01:35:52 AM (20 years ago)

Author:

ryan

Message:

Handle theme name collisions more elegantly.

File:

• trunk/wp-includes/functions.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -1594 +1594 @@
         if (empty($template_dir)) $template_dir = '/';
         if (empty($stylesheet_dir)) $stylesheet_dir = '/';
+
+        // 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 Default and Classic themes always trump their pretenders.
+        if ( isset($themes[$name]) ) {
+            if ( ('WordPress Default' == $name || 'WordPress Classic' == $name) &&
+                     ('default' == $stylesheet || 'classic' == $stylesheet) ) {
+                // If another theme has claimed to be one of our default themes, move
+                // them aside.
+                $suffix = $themes[$name]['Stylesheet'];
+                $new_name = "$name/$suffix";
+                $themes[$new_name] = $themes[$name];
+                $themes[$new_name]['Name'] = $new_name;
+            } else {
+                $name = "$name/$stylesheet";
+            }
+        }
         
         $themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template, 'Stylesheet' => $stylesheet, 'Template Files' => $template_files, 'Stylesheet Files' => $stylesheet_files, 'Template Dir' => $template_dir, 'Stylesheet Dir' => $stylesheet_dir, 'Status' => $theme_data['Status']);
@@ -1633 +1651 @@
     $current_template = get_settings('template');
     $current_stylesheet = get_settings('stylesheet');
-    $current_theme = 'Default';
+    $current_theme = 'WordPress Default';
 
     if ($themes) {
@@ -1640 +1658 @@
                     $themes[$theme_name]['Template'] == $current_template) {
                 $current_theme = $themes[$theme_name]['Name'];
+                break;
             }
         }