forked from GNUsocial/gnu-social
		
	null reference error
darcs-hash:20080718042030-84dde-78e056f1e47335556d353cdf2940651f59291efd.gz
This commit is contained in:
		| @@ -145,7 +145,11 @@ class TwitapifriendshipsAction extends TwitterapiAction { | ||||
| 			return Profile::staticGet($id); | ||||
| 		} else { | ||||
| 			$user = User::staticGet('nickname', $id); | ||||
| 			return $user->getProfile(); | ||||
| 			if ($user) { | ||||
| 				return $user->getProfile(); | ||||
| 			} else { | ||||
| 				return NULL; | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
| 	 | ||||
| @@ -153,8 +157,7 @@ class TwitapifriendshipsAction extends TwitterapiAction { | ||||
| 		if (is_numeric($id)) { | ||||
| 			return User::staticGet($id); | ||||
| 		} else { | ||||
| 			$user = User::staticGet('nickname', $id); | ||||
| 			return $user->getProfile(); | ||||
| 			return User::staticGet('nickname', $id); | ||||
| 		} | ||||
| 	} | ||||
| } | ||||
		Reference in New Issue
	
	Block a user