summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/reauthenticate.php
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-08-01 08:31:09 -0700
committerTim Almdal <tnalmdal@shaw.ca>2010-08-01 08:31:09 -0700
commita4531707274318496bb7a4477d940030d870f133 (patch)
tree6715be3db83d7f834676a0b2c7a38c9bd58ce1a5 /modules/gallery/controllers/reauthenticate.php
parentfc580037e797fad48b49fcffa7aa69dca8761972 (diff)
parent7607e1f932dda53144792d0b7e8674a34fbc7f9a (diff)
Merge branch 'dialog' of github.com:gallery/gallery3 into dialog
Diffstat (limited to 'modules/gallery/controllers/reauthenticate.php')
-rw-r--r--modules/gallery/controllers/reauthenticate.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gallery/controllers/reauthenticate.php b/modules/gallery/controllers/reauthenticate.php
index 7f9e5edc..0486c0fe 100644
--- a/modules/gallery/controllers/reauthenticate.php
+++ b/modules/gallery/controllers/reauthenticate.php
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class Reauthenticate_Controller extends Controller {
- public function index($share_translations_form=null) {
+ public function index() {
if (!identity::active_user()->admin) {
access::forbidden();
}
@@ -29,7 +29,7 @@ class Reauthenticate_Controller extends Controller {
$v = new View("reauthenticate.html");
$v->form = self::_form();
$v->user_name = identity::active_user()->name;
- json::reply(array("form" => (string) $v));
+ print $v;
} else {
self::_show_form(self::_form());
}
@@ -58,7 +58,7 @@ class Reauthenticate_Controller extends Controller {
$v = new View("reauthenticate.html");
$v->form = $form;
$v->user_name = identity::active_user()->name;
- json::reply(array("form" => (string) $v));
+ json::reply(array("html" => (string)$v));
} else {
self::_show_form($form);
}