diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-13 11:48:42 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-13 11:48:42 -0700 |
| commit | d9720b77e9c4455df3e3237c285ad5a33afdd591 (patch) | |
| tree | 2d2d7f918b9e7af7d312d7bc08f05fce0e4c528f /modules/gallery/controllers/password.php | |
| parent | 4dd6e4cc4c3353b36a5c69a845ad879ddf085d2f (diff) | |
| parent | 53393a144609c0d8402b14606f52422bf3f28daf (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/controllers/admin_users.php
modules/gallery/controllers/password.php
modules/gallery/helpers/group.php
modules/gallery/helpers/user.php
modules/notification/helpers/notification.php
Diffstat (limited to 'modules/gallery/controllers/password.php')
| -rw-r--r-- | modules/gallery/controllers/password.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/controllers/password.php b/modules/gallery/controllers/password.php index 817ff01c..e8b08960 100644 --- a/modules/gallery/controllers/password.php +++ b/modules/gallery/controllers/password.php @@ -32,7 +32,7 @@ class Password_Controller extends Controller { if (request::method() == "post") { $this->_change_password(); } else { - $user = user::lookyp_by_hash(Input::instance()->get("key")); + $user = user::lookup_by_hash(Input::instance()->get("key")); if (!empty($user)) { print $this->_new_password_form($user->hash); } else { @@ -116,7 +116,7 @@ class Password_Controller extends Controller { private function _change_password() { $view = $this->_new_password_form(); if ($view->content->validate()) { - $user = user::lookyp_by_hash(Input::instance()->get("key")); + $user = user::lookup_by_hash(Input::instance()->get("key")); if (empty($user)) { throw new Exception("@todo FORBIDDEN", 503); } |