1 files changed, 5 insertions, 3 deletions
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 82b8a790..54d16322 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -26,11 +26,13 @@ class gallery_Core {
    */
   static function maintenance_mode() {
     if (Router::$controller != "login" &&
+        Router::$controller != "combined" &&
         module::get_var("gallery", "maintenance_mode", 0) &&
         !identity::active_user()->admin) {
-      Router::$controller = "maintenance";
-      Router::$controller_path = MODPATH . "gallery/controllers/maintenance.php";
-      Router::$method = "index";
+      Session::instance()->set("continue_url", url::abs_site("admin/maintenance"));
+      Router::$controller = "login";
+      Router::$controller_path = MODPATH . "gallery/controllers/login.php";
+      Router::$method = "html";
     }
   }