Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

multiauth: fix for calling new properties and methods correctly

  • Loading branch information...
commit db061ab2dc455f1f9d426e26085d1a6d38213e11 1 parent f6bb9a9
jmg324 authored
Showing with 8 additions and 8 deletions.
  1. +2 −2 login/change_password.php
  2. +6 −6 login/forgot_password.php
View
4 login/change_password.php
@@ -57,9 +57,9 @@
// load the appropriate auth plugin
$userauth = get_auth_plugin($user->auth);
if ($userauth->can_change_password()){
- if ($userauth->user_update_password($user, $data->newpassword1)) {
+ if ($userauth->user_update_password($user->username, $data->newpassword1)) {
// hash the $user->password field (without local db update)
- update_internal_user_password($user, $frm->newpassword1, false);
+ update_internal_user_password($user, $data->newpassword1, false);
} else {
error('Could not set the new password');
}
View
12 login/forgot_password.php
@@ -137,7 +137,7 @@
// if url defined then add that to the message (with a standard message)
if (method_exists($userauth, 'change_password_url') and $userauth->change_password_url()) {
$strextmessage .= $strpasswordextlink . '<br /><br />';
- $txt->extmessage .= '<a href="' . $userauth->change_password_url() . '">' . $userauth->change_password_url() . '</a>';
+ $strextmessage .= '<a href="' . $userauth->change_password_url() . '">' . $userauth->change_password_url() . '</a>';
}
// if nothing to display, just do message that we can't help
if (empty($strextmessage)) {
@@ -265,12 +265,12 @@
}
-echo $strforgotteninstruct;
-
+if(!$mform->data_submitted()) {
+ echo $strforgotteninstruct;
+ $mform->display();
+}
print_simple_box_end();
-$mform->display();
-
print_footer();
-?>
+?>
Please sign in to comment.
Something went wrong with that request. Please try again.