diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-26 11:42:48 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-26 11:42:48 +0200 |
| commit | 5792b3d3580b9f09460305858293398d8d8a9abf (patch) | |
| tree | 90d60e9db4ed733a60c2890c7305d45ddd48be42 /include/api.php | |
| parent | 991656a3ef396d9a6bd43ddb752627c2880b17ba (diff) | |
| parent | 428e6766411d2c6708ad25f726c4bcf1d64af1cc (diff) | |
| download | volse-hubzilla-5792b3d3580b9f09460305858293398d8d8a9abf.tar.gz volse-hubzilla-5792b3d3580b9f09460305858293398d8d8a9abf.tar.bz2 volse-hubzilla-5792b3d3580b9f09460305858293398d8d8a9abf.zip | |
Merge branch 'master' into newui
Diffstat (limited to 'include/api.php')
| -rw-r--r-- | include/api.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/api.php b/include/api.php index 5d008c290..74b4aaf6e 100644 --- a/include/api.php +++ b/include/api.php @@ -55,7 +55,7 @@ // process normal login request $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) - AND `password` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1", + AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1", dbesc(trim($user)), dbesc(trim($user)), dbesc($encrypted) |