Changeset 5642 for trunk

Timestamp:

Apr 4, 2010, 8:45:58 PM (15 years ago)

Author:

grum

Message:

initialize the 'is_default' key to false when the item (theme, language) is not the default item

Location:

trunk/admin

Files:

• languages_installed.php (modified) (3 diffs)
• themes_installed.php (modified) (6 diffs)

trunk/admin/languages_installed.php

@@ -67 +67 @@
     $language['state'] = 'active';
     $language['deactivable'] = true;
-    
+
     if (count($languages->db_languages) <= 1)
     {
@@ -84 +84 @@
     $language['state'] = 'inactive';
   }
-  
+
   if ($language_id == $default_language)
   {
@@ -92 +92 @@
   else
   {
+    $language['is_default'] = false;
     array_push($tpl_languages, $language);
   }

trunk/admin/themes_installed.php

@@ -79 +79 @@
   {
     $fs_theme['deactivable'] = true;
-    
+
     if (count($db_theme_ids) <= 1)
     {
@@ -85 +85 @@
       $fs_theme['deactivate_tooltip'] = l10n('Impossible to deactivate this theme, you need at least one theme.');
     }
-    
+
     if ($theme_id == $default_theme)
     {
@@ -93 +93 @@
     else
     {
+      $fs_theme['is_default'] = false;
       array_push($active_themes, $fs_theme);
     }
@@ -100 +101 @@
     // is the theme "activable" ?
     $fs_theme['activable'] = true;
-    
+
     $missing_parent = $themes->missing_parent_theme($theme_id);
     if (isset($missing_parent))
     {
       $fs_theme['activable'] = false;
-      
+
       $fs_theme['activate_tooltip'] = sprintf(
         l10n('Impossible to activate this theme, the parent theme is missing: %s'),
@@ -116 +117 @@
 
     $fs_theme['deletable'] = true;
-    
+
     if (count($children) > 0)
     {
       $fs_theme['deletable'] = false;
-      
+
       $fs_theme['delete_tooltip'] = sprintf(
         l10n('Impossible to delete this theme. Other themes depends on it: %s'),
@@ -126 +127 @@
         );
     }
-    
+
     array_push($inactive_themes, $fs_theme);
   }