summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-05-05 21:06:43 -0700
committerAndrew Dolgov <[email protected]>2013-05-05 21:06:43 -0700
commit0e72dbd79e05c073ad5c7ed2f87866152186e092 (patch)
tree0529bb015980d89069785b4e03c8f8912be566c2 /classes
parentda3077d1b10571f8c10d548071a0c4171dd90485 (diff)
parent233b74ad22395f02a245a4e3a3fc21c9101892f1 (diff)
Merge pull request #179 from nottwo/$link-cleanup
Remove obsolete $link parameter for password reset
Diffstat (limited to 'classes')
-rw-r--r--classes/pref/users.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/pref/users.php b/classes/pref/users.php
index d97362f9f..60059dc8d 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -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'");
$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);
- 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'");
if ($show_password) {