diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-08-08 17:29:29 -0700 | 
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-08-08 17:29:29 -0700 | 
| commit | 58bf479f4c040ac73ea190d966ffd5408f9908f0 (patch) | |
| tree | a19dece598404b48cca783f89877944fd4538fb1 /modules/user/controllers/users.php | |
| parent | 1ad1f9517f91875875f2e062bda7d834827c3430 (diff) | |
| parent | acb1faaa594fc5067c4340e073afca3b83f819d4 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/user/controllers/users.php')
| -rw-r--r-- | modules/user/controllers/users.php | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php index 5e6239d8..6bb4967f 100644 --- a/modules/user/controllers/users.php +++ b/modules/user/controllers/users.php @@ -41,7 +41,7 @@ class Users_Controller extends Controller {        // Translate ORM validation errors into form error messages        foreach ($e->validation->errors() as $key => $error) {          $form->edit_user->inputs[$key]->add_error($error, 1); -     } +      }        $valid = false;      } @@ -55,7 +55,7 @@ class Users_Controller extends Controller {        module::event("user_edit_form_completed", $user, $form);        message::success(t("User information updated"));        json::reply(array("result" => "success", -			"resource" => url::site("users/{$user->id}"))); +                        "resource" => url::site("users/{$user->id}")));      } else {        json::reply(array("result" => "error", "html" => (string)$form));      } @@ -87,7 +87,7 @@ class Users_Controller extends Controller {        module::event("user_auth", $user);        module::event("user_password_change", $user);        json::reply(array("result" => "success", -			"resource" => url::site("users/{$user->id}"))); +                        "resource" => url::site("users/{$user->id}")));      } else {        log::warning("user", t("Failed password change for %name", array("name" => $user->name)));        $name = $user->name; @@ -121,7 +121,7 @@ class Users_Controller extends Controller {        message::success(t("Email address changed"));        module::event("user_auth", $user);        json::reply(array("result" => "success", -			"resource" => url::site("users/{$user->id}"))); +                        "resource" => url::site("users/{$user->id}")));      } else {        log::warning("user", t("Failed email change for %name", array("name" => $user->name)));        $name = $user->name; | 
