]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Allow screennames that are === '0'
authorMikael Nordfeldth <mmn@hethane.se>
Mon, 8 Feb 2016 10:38:52 +0000 (11:38 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Mon, 8 Feb 2016 10:40:46 +0000 (11:40 +0100)
lib/apiaction.php

index 24f42e4a4103d55e97709eb9f55c975294f80333..16c375ee120f958307e378844f26a3a04bd6e680 100644 (file)
@@ -1404,20 +1404,21 @@ class ApiAction extends Action
                 if (self::is_decimal($this->arg('user_id'))) {
                     return Profile::getKV('id', $this->arg('user_id'));
                 }
-            } else if ($this->arg('screen_name')) {
+            } elseif (mb_strlen($this->arg('screen_name')) > 0) {
                 $nickname = common_canonical_nickname($this->arg('screen_name'));
-                $user = User::getKV('nickname', $nickname);
-                return $user instanceof User ? $user->getProfile() : null;
+                $user = User::getByNickname($nickname);
+                return $user->getProfile();
             } else {
                 // Fall back to trying the currently authenticated user
                 return $this->scoped;
             }
-        } else if (self::is_decimal($id)) {
-            return Profile::getKV($id);
+        } else if (self::is_decimal($id) && intval($id) > 0) {
+            return Profile::getByID($id);
         } else {
+            // FIXME: check if isAcct to identify remote profiles and not just local nicknames
             $nickname = common_canonical_nickname($id);
-            $user = User::getKV('nickname', $nickname);
-            return $user ? $user->getProfile() : null;
+            $user = User::getByNickname($nickname);
+            return $user->getProfile();
         }
     }
 
@@ -1564,4 +1565,4 @@ class ApiAction extends Action
 
         return $uri;
     }
-}
\ No newline at end of file
+}