valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #179 from nottwo/$link-cleanup 

Remove obsolete $link parameter for password reset
This commit is contained in:
Andrew Dolgov 2013-05-05 21:06:43 -07:00
parent da3077d1b1 233b74ad22
commit 0e72dbd79e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/pref/users.php
View File

@ -248,9 +248,9 @@ class Pref_Users extends Handler_Protected {
} }
} }
static function resetUserPassword($link, $uid, $show_password) { static function resetUserPassword($uid, $show_password) {
$result = db_query($link, "SELECT login,email $result = db_query("SELECT login,email
FROM ttrss_users WHERE id = '$uid'"); FROM ttrss_users WHERE id = '$uid'");
$login = db_fetch_result($result, 0, "login"); $login = db_fetch_result($result, 0, "login");
@ -262,7 +262,7 @@ class Pref_Users extends Handler_Protected {
$pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true); $pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true);
db_query($link, "UPDATE ttrss_users SET pwd_hash = '$pwd_hash', salt = '$new_salt' db_query("UPDATE ttrss_users SET pwd_hash = '$pwd_hash', salt = '$new_salt'
WHERE id = '$uid'"); WHERE id = '$uid'");
if ($show_password) { if ($show_password) {