summaryrefslogtreecommitdiff
path: root/modules/user/controllers/users.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-07-13 12:30:03 -0700
committerBharat Mediratta <bharat@menalto.com>2010-07-13 12:30:03 -0700
commit887154a3b797eade36c1c651e2e849c613459544 (patch)
tree835214c5c76dbfa2b1de584a6f3f58235a0009ad /modules/user/controllers/users.php
parent5eb4b8ff6cae33d83cfef8ea3d41cba4352e65d8 (diff)
parent69dfb51490b62bd639c8e09461fad15f4fb51650 (diff)
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/user/controllers/users.php')
-rw-r--r--modules/user/controllers/users.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 7f3f6b1f..4ddfb47c 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -139,7 +139,7 @@ class Users_Controller extends Controller {
access::forbidden();
}
- print $this->_get_edit_form($user);
+ print json_encode(array("form" => (string) $this->_get_edit_form($user)));
}
public function form_change_password($id) {
@@ -148,7 +148,7 @@ class Users_Controller extends Controller {
access::forbidden();
}
- print $this->_get_change_password_form($user);
+ print json_encode(array("form" => (string) $this->_get_change_password_form($user)));
}
public function form_change_email($id) {
@@ -157,7 +157,7 @@ class Users_Controller extends Controller {
access::forbidden();
}
- print $this->_get_change_email_form($user);
+ print json_encode(array("form" => (string) $this->_get_change_email_form($user)));
}
private function _get_change_password_form($user) {