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

1 files changed, 2 insertions, 9 deletions

diff --git a/modules/gallery/controllers/admin.php b/modules/gallery/controllers/admin.php
index 8effe28f..40dd260b 100644
--- a/modules/gallery/controllers/admin.php
+++ b/modules/gallery/controllers/admin.php
@@ -38,8 +38,7 @@ class Admin_Controller extends Controller {
       return self::_reauth_check();
     }
     if (auth::must_reauth_for_admin_area()) {
-      print self::_prompt_for_reauth($controller_name, $args);
-      return;
+      return self::_prompt_for_reauth($controller_name, $args);
     }
 
     if (request::method() == "post") {
@@ -87,13 +86,7 @@ class Admin_Controller extends Controller {
       // Avoid anti-phishing protection by passing the url as session variable.
       Session::instance()->set("continue_url", url::abs_current(true));
     }
-
-    // Check that we we not in a dialog. If we are, then use an ajax response.
-    if (strpos(Router::$query_string, "g-in-dialog") === false) {
-      url::redirect("reauthenticate");
-    } else {
-      return reauthenticate::get_authenticate_form();
-    }
+    url::redirect("reauthenticate");
   }
 }