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

1 files changed, 5 insertions, 1 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);
       }
     }