Merge branch 'master' of git@github.com:gallery/gallery3

4 files changed, 14 insertions, 6 deletions

diff --git a/modules/gallery/controllers/admin_modules.php b/modules/gallery/controllers/admin_modules.php
index f7dd909d..ed1f7665 100644
--- a/modules/gallery/controllers/admin_modules.php
+++ b/modules/gallery/controllers/admin_modules.php
@@ -45,7 +45,11 @@ class Admin_Modules_Controller extends Admin_Controller {
       } else if (!$info->active && $desired && !module::is_active($module_name)) {
         $changes->activate[] = $module_name;
         $activated_names[] = $info->name;
-        module::install($module_name);
+        if (module::is_installed($module_name)) {
+          module::upgrade($module_name);
+        } else {
+          module::install($module_name);
+        }
         module::activate($module_name);
       }
     }
diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index 2716ed93..8970c3c9 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -56,6 +56,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
 
       module::set_var("gallery", "header_text", $form->edit_theme->header_text->value);
       module::set_var("gallery", "footer_text", $form->edit_theme->footer_text->value);
+      module::set_var("gallery", "show_credits", $form->edit_theme->show_credits->value);
 
       message::success(t("Updated theme details"));
       url::redirect("admin/theme_options");
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 17fdec6b..22f50fb8 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -167,7 +167,8 @@ class Albums_Controller extends Items_Controller {
     $form = album::get_edit_form($album);
     if ($valid = $form->validate()) {
       // Make sure that there's not a conflict
-      if (Database::instance()
+      if ($album->id != 1 &&
+          Database::instance()
           ->from("items")
           ->where("parent_id", $album->parent_id)
           ->where("id <>", $album->id)
@@ -188,7 +189,9 @@ class Albums_Controller extends Items_Controller {
       $album->description = $form->edit_album->description->value;
       $album->sort_column = $form->edit_album->sort_order->column->value;
       $album->sort_order = $form->edit_album->sort_order->direction->value;
-      $album->rename($form->edit_album->dirname->value);
+      if ($album->id != 1) {
+        $album->rename($form->edit_album->dirname->value);
+      }
       $album->save();
 
       module::event("item_updated", $orig, $album);
diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index 5eb96fdd..91952fa9 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -50,8 +50,8 @@ class Upgrader_Controller extends Controller {
     }
 
     // Upgrade gallery and user first
-    module::install("gallery");
-    module::install("user");
+    module::upgrade("gallery");
+    module::upgrade("user");
 
     // Then upgrade the rest
     foreach (module::available() as $id => $module) {
@@ -60,7 +60,7 @@ class Upgrader_Controller extends Controller {
       }
 
       if ($module->active && $module->code_version != $module->version) {
-        module::install($id);
+        module::upgrade($id);
       }
     }