summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-01-22 12:04:57 +0400
committerAndrew Dolgov <[email protected]>2012-01-22 12:04:57 +0400
commit3a2c5c6642096f34f8de715d28ecf8636aaab8e1 (patch)
tree3735718a8ed81c6d3c5b9d96eb55af5a2cfa1a99 /include
parente90053fe8400893190f6b91bb4b78abe481f2e7f (diff)
fix login before updating to schema 88
Diffstat (limited to 'include')
-rw-r--r--include/functions.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/functions.php b/include/functions.php
index 357fff787..f0ff2ce28 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -711,7 +711,7 @@
}
}
- } else {
+ } else if (get_schema_version($link) > 87) {
$result = db_query($link, "SELECT salt FROM ttrss_users WHERE
login = '$login'");
@@ -754,6 +754,11 @@
login = '$login' AND pwd_hash = '$pwd_hash'";
}
+ } else {
+ $query = "SELECT id,login,access_level,pwd_hash
+ FROM ttrss_users WHERE
+ login = '$login' AND (pwd_hash = '$pwd_hash1' OR
+ pwd_hash = '$pwd_hash2')";
}
$result = db_query($link, $query);