summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/admin.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-07-16 11:58:13 -0700
committerBharat Mediratta <bharat@menalto.com>2010-07-16 11:58:13 -0700
commit583950616ef7c89acc0b0cbb52e77ffdb0afbb3d (patch)
tree738dbf7ba5f704c9327a83fed9fac4d3f050e137 /modules/gallery/controllers/admin.php
parentb51b49cb63d990611dacccca5e2a505c6c96357d (diff)
Improve the fix for #1176 to use request::is_ajax() instead of tacking
on a query param to urls that appear in dialogs. This keeps things simpler.
Diffstat (limited to 'modules/gallery/controllers/admin.php')
-rw-r--r--modules/gallery/controllers/admin.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/modules/gallery/controllers/admin.php b/modules/gallery/controllers/admin.php
index 3befac7d..eacacb28 100644
--- a/modules/gallery/controllers/admin.php
+++ b/modules/gallery/controllers/admin.php
@@ -84,10 +84,7 @@ class Admin_Controller extends Controller {
private static function _prompt_for_reauth($controller_name, $args) {
if (request::method() == "get") {
// Avoid anti-phishing protection by passing the url as session variable.
- $reauthenticate =
- array("continue_url" => url::abs_current(true),
- "in_dialog" => strpos(Router::$query_string, "gallery_dialog_request") !== false);
- Session::instance()->set("reauthenticate", $reauthenticate);
+ Session::instance()->set("continue_url", url::abs_current(true));
}
url::redirect("reauthenticate");