X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2Fauth%2FAuth_db.class.php;h=dccc98236669a0bf202ab20220e323ab0985fec0;hb=ecf7d911c95935f8cfb2403f645cd12f93d8c3f5;hp=4861552c77f571e537d1cc00da558e5884a7bdb8;hpb=c8144edb537a2447d78cda4a2e6c53616a63c876;p=timetracker.git

diff --git a/WEB-INF/lib/auth/Auth_db.class.php b/WEB-INF/lib/auth/Auth_db.class.php
index 4861552c..dccc9823 100644
--- a/WEB-INF/lib/auth/Auth_db.class.php
+++ b/WEB-INF/lib/auth/Auth_db.class.php
@@ -71,7 +71,10 @@ class Auth_db extends Auth {
         WHERE login = ".$mdb2->quote($login)." AND password = old_password(".$mdb2->quote($password).") AND status = 1";
       $res = $mdb2->query($sql);
       if (is_a($res, 'PEAR_Error')) {
-        die($res->getMessage());
+        return false; // Simply return false for a meaningful error message on screen, see the comment below.
+        // die($res->getMessage()); // old_password() function is removed in MySQL 5.7.5.
+                                    // We are getting a confusing "MDB2 Error: not found" in this case if we die.
+        // TODO: perhaps it's time to simplify things and remove handling of old passwords completely.
       }
       $val = $res->fetchRow();
       if ($val['id'] > 0) {