diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-10 08:07:20 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-10 08:07:20 -0800 |
| commit | b42c736607591f8e2bed4aea474ad622b3f7445a (patch) | |
| tree | 83be1069a48cf604a0f73c5d895248c724024fc7 /modules/user/controllers | |
| parent | 5e703186fbf0c0cb689fc737de7c074249361ef9 (diff) | |
| parent | 8763e475adc7bb26ed9705c9d61a1db2b20e60c4 (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/organize/js/organize.js
Diffstat (limited to 'modules/user/controllers')
| -rw-r--r-- | modules/user/controllers/password.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php index 8309d2cc..07fdc1ed 100644 --- a/modules/user/controllers/password.php +++ b/modules/user/controllers/password.php @@ -110,7 +110,7 @@ class Password_Controller extends Controller { "mistyped", t("The password and the confirm password must match")); $group->submit("")->value(t("Update")); - $template->content = new View("user_form.html"); + $template->content = new View("confirm_reset_password.html"); $template->content->form = $form; return $template; } |