Merge branch '0.8.x' into userdesign

Conflicts:

	actions/showfavorites.php
	lib/action.php

1 files changed, 4 insertions, 9 deletions

diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index b90bbfa98..13a8746cd 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -17,7 +17,9 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
@@ -51,18 +53,11 @@ class TwitapiusersAction extends TwitterapiAction
             $user = $apidata['user'];
         }
 
-        if (!$user) {
+        if (empty($user)) {
             $this->client_error(_('Not found.'), 404, $apidata['content-type']);
             return;
         }
 
-        $profile = $user->getProfile();
-
-        if (!$profile) {
-            common_server_error(_('User has no profile.'));
-            return;
-        }
-
         $twitter_user = $this->twitter_user_array($profile, true);
 
         if ($apidata['content-type'] == 'xml') {