summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/gallery.dialog.js2
-rw-r--r--modules/gallery/controllers/admin.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 1d0eae7e..a36c561a 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -27,7 +27,7 @@
$("#g-dialog").gallery_show_loading();
- var url = sHref + (sHref.indexOf("?") == -1 ? "?" : "&") + "g-in-dialog";
+ var url = sHref + (sHref.indexOf("?") == -1 ? "?" : "&") + "gallery_dialog_request=1";
$.getJSON(url, function(data) {
$("#g-dialog").html(unescape(data.form)).gallery_show_loading();
diff --git a/modules/gallery/controllers/admin.php b/modules/gallery/controllers/admin.php
index 7d2a0c43..3befac7d 100644
--- a/modules/gallery/controllers/admin.php
+++ b/modules/gallery/controllers/admin.php
@@ -84,9 +84,9 @@ 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, "g-in-dialog") !== false,
- "controller" => $controller_name, "args" => $args);
+ $reauthenticate =
+ array("continue_url" => url::abs_current(true),
+ "in_dialog" => strpos(Router::$query_string, "gallery_dialog_request") !== false);
Session::instance()->set("reauthenticate", $reauthenticate);
}