Merge remote-tracking branch 'upstream/master'

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index fb03b30a0a5202bf0624aa5ec52f6e189816cc47..8a93093c70ac910fb8a99ace62a2938b114e2070 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -74,7 +74,7 @@
                // process normal login request
 
                $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) 
-                       AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
+                       AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
                        dbesc(trim($user)),
                        dbesc(trim($user)),
                        dbesc($encrypted)