Merge branch '12.x'

2021-02-19 13:17:23 +08:00
parent 3ee2aa34a7 fc28bbfc9e
commit 6bf40e474d
109 changed files with 5297 additions and 1570 deletions
@@ -365,7 +365,8 @@ class baseHelper
            }

            /* Check decrypted password. Judge whether there is garbled code. */
-            if(json_encode($decryptedPassword) === 'null') $decryptedPassword = '';
+            $jsoned = json_encode($decryptedPassword);
+            if($jsoned === 'null' or empty($jsoned)) $decryptedPassword = '';
        }
        if(empty($decryptedPassword)) $decryptedPassword = $password;