fix login before updating to schema 88

diff --git a/include/functions.php b/include/functions.php
index 357fff78723fb3e6e0eb6efaa965e08a399f10fb..f0ff2ce2856ccf93cfcfebf3c51cda244093aa86 100644 (file)
--- 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);