Merge https://github.com/friendica/friendica into pull

[friendica.git] / include / oauth.php

diff --git a/include/oauth.php b/include/oauth.php
old mode 100755 (executable)
new mode 100644 (file)
index 2724dcf..28ac442
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -133,7 +133,7 @@ class FKOAuth1 extends OAuthServer {
        function loginUser($uid){
                logger("FKOAuth1::loginUser $uid");
                $a = get_app();
-               $r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
+               $r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
                        intval($uid)
                );
                if(count($r)){
@@ -145,6 +145,7 @@ class FKOAuth1 extends OAuthServer {
                }
                $_SESSION['uid'] = $record['uid'];
                $_SESSION['theme'] = $record['theme'];
+               $_SESSION['mobile-theme'] = get_pconfig($record['uid'], 'system', 'mobile_theme');
                $_SESSION['authenticated'] = 1;
                $_SESSION['page_flags'] = $record['page-flags'];
                $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];