summaryrefslogtreecommitdiff
path: root/modules/user/controllers/users.php
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-07-06 14:12:00 -0700
committerTim Almdal <tnalmdal@shaw.ca>2010-07-06 14:12:01 -0700
commitdbf3199e46d8a9c0ae37108f6afda35232ef4cdd (patch)
tree0dfda5cf87fdcd5ded534c9eb6f21bb44e4906f9 /modules/user/controllers/users.php
parent9d66783f47636153bf3661d1d89e694dd5188c36 (diff)
Fix for ticket #1181. Use $.getJSON to retrieve the json contents of the dialog. Convert all the controllers
that create the data to go into a dialog to return the html as part of a json object.
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) {