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

Conflicts:
	modules/gallery/models/item.php

1 files changed, 1 insertions, 1 deletions

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 043a4ee5..f87602b8 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -49,7 +49,6 @@ class Admin_Users_Controller extends Controller {
         $user->locale = $desired_locale == "none" ? null : $desired_locale;
       }
       $user->save();
-
       module::event("user_add_form_admin_completed", $user, $form);
 
       message::success(t("Created user %user_name", array("user_name" => p::clean($user->name))));
@@ -141,6 +140,7 @@ class Admin_Users_Controller extends Controller {
         $user->admin = $form->edit_user->admin->checked;
       }
       $user->save();
+      module::event("user_edit_form_admin_completed", $user, $form);
 
       message::success(t("Changed user %user_name", array("user_name" => p::clean($user->name))));
       print json_encode(array("result" => "success"));