aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-01 00:39:40 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-01 00:39:40 +0000
commitf1c69003389c75ad8061852487923f5bfb5a6001 (patch)
treee363e6f538a5a1a41a8a616e1886ed72c421bda5 /engine
parentbbc906683aefec7fa8360dd0718e142bea829fef (diff)
downloadelgg-f1c69003389c75ad8061852487923f5bfb5a6001.tar.gz
elgg-f1c69003389c75ad8061852487923f5bfb5a6001.tar.bz2
Fixes #3207 passing code variable to form for password reset
git-svn-id: http://code.elgg.org/elgg/trunk@8886 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/users.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 1d0429760..638e96aab 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -772,7 +772,6 @@ function execute_new_password_request($user_guid, $conf_code) {
* @return void
*/
function elgg_user_resetpassword_page_handler($page) {
- global $CONFIG;
$user_guid = get_input('u');
$code = get_input('c');
@@ -785,12 +784,18 @@ function elgg_user_resetpassword_page_handler($page) {
forward();
}
- $form = elgg_view_form('user/passwordreset', array(), array('user' => $user));
+ $params = array(
+ 'guid' => $user_guid,
+ 'code' => $code,
+ );
+ $form = elgg_view_form('user/passwordreset', array(), $params);
$title = elgg_echo('resetpassword');
$content = elgg_view_title(elgg_echo('resetpassword')) . $form;
- echo elgg_view_page($title, elgg_view_layout('one_column', array('content' => $content)));
+ $body = elgg_view_layout('one_column', array('content' => $content));
+
+ echo elgg_view_page($title, $body);
}
/**