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 841c81f741114a8707958b4d95e48d56ee8d5892..472ed09247846ea8cf39a0131ca8c68969fcb68b 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -99,20 +99,6 @@ class User
                return DBA::selectFirst('user', [], ['uid' => $uid]);
        }
 
-       /**
-        * @param  integer       $uid
-        * @return array|boolean User record if it exists, false otherwise
-        * @throws Exception
-        */
-       public static function getPublicContactById($uid)
-       {
-               $self = DBA::selectFirst('contact', ['url'], ['self' => true, 'uid' => $uid]);
-               if (!DBA::isResult($self)) {
-                       return false;
-               }
-               return Contact::getIdForURL($self['url'], 0, true);
-       }
-
        /**
         * @brief Returns the user id of a given profile URL
         *
@@ -148,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`