From d2aa8a3407f357fe255746fd7849f0b49c101186 Mon Sep 17 00:00:00 2001
From: grum <grum@piwigo.org>
Date: Sun, 4 Apr 2010 18:45:58 +0000
Subject: initialize the 'is_default' key to false when the item (theme,
 language) is not the default item

git-svn-id: http://piwigo.org/svn/trunk@5642 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/languages_installed.php |  7 ++++---
 admin/themes_installed.php    | 17 +++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'admin')

diff --git a/admin/languages_installed.php b/admin/languages_installed.php
index 74023a34b..fb1ee0d27 100644
--- a/admin/languages_installed.php
+++ b/admin/languages_installed.php
@@ -66,7 +66,7 @@ foreach($languages->fs_languages as $language_id => $language_name)
   {
     $language['state'] = 'active';
     $language['deactivable'] = true;
-    
+
     if (count($languages->db_languages) <= 1)
     {
       $language['deactivable'] = false;
@@ -83,7 +83,7 @@ foreach($languages->fs_languages as $language_id => $language_name)
   {
     $language['state'] = 'inactive';
   }
-  
+
   if ($language_id == $default_language)
   {
     $language['is_default'] = true;
@@ -91,6 +91,7 @@ foreach($languages->fs_languages as $language_id => $language_name)
   }
   else
   {
+    $language['is_default'] = false;
     array_push($tpl_languages, $language);
   }
 }
@@ -127,4 +128,4 @@ DELETE
 }
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'languages');
-?>
\ No newline at end of file
+?>
diff --git a/admin/themes_installed.php b/admin/themes_installed.php
index 7ef26ead7..a4403266e 100644
--- a/admin/themes_installed.php
+++ b/admin/themes_installed.php
@@ -78,13 +78,13 @@ foreach ($themes->fs_themes as $theme_id => $fs_theme)
   if (in_array($theme_id, $db_theme_ids))
   {
     $fs_theme['deactivable'] = true;
-    
+
     if (count($db_theme_ids) <= 1)
     {
       $fs_theme['deactivable'] = false;
       $fs_theme['deactivate_tooltip'] = l10n('Impossible to deactivate this theme, you need at least one theme.');
     }
-    
+
     if ($theme_id == $default_theme)
     {
       $fs_theme['is_default'] = true;
@@ -92,6 +92,7 @@ foreach ($themes->fs_themes as $theme_id => $fs_theme)
     }
     else
     {
+      $fs_theme['is_default'] = false;
       array_push($active_themes, $fs_theme);
     }
   }
@@ -99,12 +100,12 @@ foreach ($themes->fs_themes as $theme_id => $fs_theme)
   {
     // 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'),
         $missing_parent
@@ -115,17 +116,17 @@ foreach ($themes->fs_themes as $theme_id => $fs_theme)
     $children = $themes->get_children_themes($theme_id);
 
     $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'),
         implode(', ', $children)
         );
     }
-    
+
     array_push($inactive_themes, $fs_theme);
   }
 }
@@ -146,4 +147,4 @@ $template->assign(
 $themes->set_tabsheet($page['page']);
 $template->set_filenames(array('themes' => 'themes_installed.tpl'));
 $template->assign_var_from_handle('ADMIN_CONTENT', 'themes');
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.3