Merge pull request #6989 from nupplaphil/task/basePath_baseUrl_fix

[friendica.git] / src / Model / User.php

diff --git a/src/Model/User.php b/src/Model/User.php
index c33092a0fc7e844dbff75b3ddf23900e50672929..472ed09247846ea8cf39a0131ca8c68969fcb68b 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -29,13 +29,13 @@ use LightOpenID;
 class User
 {
        /**
-        * @name page/profile types
+        * Page/profile types
         *
-        * PAGE_NORMAL is a typical personal profile account
-        * PAGE_SOAPBOX automatically approves all friend requests as Contact::SHARING, (readonly)
-        * PAGE_COMMUNITY automatically approves all friend requests as Contact::SHARING, but with
+        * PAGE_FLAGS_NORMAL is a typical personal profile account
+        * PAGE_FLAGS_SOAPBOX automatically approves all friend requests as Contact::SHARING, (readonly)
+        * PAGE_FLAGS_COMMUNITY automatically approves all friend requests as Contact::SHARING, but with
         *      write access to wall and comments (no email and not included in page owner's ACL lists)
-        * PAGE_FREELOVE automatically approves all friend requests as full friends (Contact::FRIEND).
+        * PAGE_FLAGS_FREELOVE automatically approves all friend requests as full friends (Contact::FRIEND).
         *
         * @{
         */
@@ -134,7 +134,8 @@ class User
                        `user`.`spubkey`,
                        `user`.`page-flags`,
                        `user`.`account-type`,
-                       `user`.`prvnets`
+                       `user`.`prvnets`,
+                       `user`.`account_removed`
                        FROM `contact`
                        INNER JOIN `user`
                                ON `user`.`uid` = `contact`.`uid`
@@ -891,7 +892,7 @@ class User
                Worker::add(PRIORITY_LOW, 'Directory', $self['url']);
 
                // Remove the user relevant data
-               Worker::add(PRIORITY_LOW, 'RemoveUser', $uid);
+               Worker::add(PRIORITY_NEGLIGIBLE, 'RemoveUser', $uid);
 
                return true;
        }