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

2 files changed, 9 insertions, 9 deletions

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index e14be393..b9d06891 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -61,7 +61,7 @@ class Admin_Users_Controller extends Admin_Controller {
   }
 
   public function add_user_form() {
-    print $this->_get_user_add_form_admin();
+    print json_encode(array("form" => (string) $this->_get_user_add_form_admin()));
   }
 
   public function delete_user($id) {
@@ -95,7 +95,7 @@ class Admin_Users_Controller extends Admin_Controller {
     if (empty($user)) {
       throw new Kohana_404_Exception();
     }
-    print $this->_get_user_delete_form_admin($user);
+    print json_encode(array("form" => (string) $this->_get_user_delete_form_admin($user)));
   }
 
   public function edit_user($id) {
@@ -146,7 +146,7 @@ class Admin_Users_Controller extends Admin_Controller {
       throw new Kohana_404_Exception();
     }
 
-    print $this->_get_user_edit_form_admin($user);
+    print json_encode(array("form" => (string) $this->_get_user_edit_form_admin($user)));
   }
 
   public function add_user_to_group($user_id, $group_id) {
@@ -199,7 +199,7 @@ class Admin_Users_Controller extends Admin_Controller {
   }
 
   public function add_group_form() {
-    print $this->_get_group_add_form_admin();
+    print json_encode(array("form" => (string) $this->_get_group_add_form_admin()));
   }
 
   public function delete_group($id) {
@@ -230,7 +230,7 @@ class Admin_Users_Controller extends Admin_Controller {
       throw new Kohana_404_Exception();
     }
 
-    print $this->_get_group_delete_form_admin($group);
+    print json_encode(array("form" => (string) $this->_get_group_delete_form_admin($group)));
   }
 
   public function edit_group($id) {
@@ -272,7 +272,7 @@ class Admin_Users_Controller extends Admin_Controller {
       throw new Kohana_404_Exception();
     }
 
-    print $this->_get_group_edit_form_admin($group);
+    print json_encode(array("form" => (string) $this->_get_group_edit_form_admin($group)));
   }
 
   /* User Form Definitions */
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) {