stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-22 01:19:54 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bharat Mediratta
2010-07-05 08:47:40 -07:00
parent 45b210c287 8493a3d36f
commit 0977c31009
5 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/gallery/controllers/admin.php
View File

@@ -38,7 +38,8 @@ class Admin_Controller extends Controller {
return self::_reauth_check();
}
if (auth::must_reauth_for_admin_area()) {
return self::_prompt_for_reauth($controller_name, $args);
print self::_prompt_for_reauth($controller_name, $args);
return;
}
if (request::method() == "post") {
@@ -86,7 +87,13 @@ 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));
}
url::redirect("reauthenticate");
// 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();
}
}
}