Merge branch '0.7.x' into 0.8.x

Conflicts:
	README
	actions/twitapiusers.php

diff --git a/README b/README
index 8622d3797060de38d6de606ef092bfa1f1cbcae0..40e5263550ef3c563c35566ae934e3c975b477b6 100644 (file)
--- a/README
+++ b/README
@@ -953,12 +953,15 @@ sslserver: use an alternate server name for SSL URLs, like
 shorturllength: Length of URL at which URLs in a message exceeding 140
                 characters will be sent to the user's chosen
                 shortening service.
+<<<<<<< HEAD:README
 design: a default design (colors and background) for the site.
         Sub-items are: backgroundcolor, contentcolor, sidebarcolor,
         textcolor, linkcolor, backgroundimage, disposition.
 dupelimit: minimum time allowed for one person to say the same thing
            twice. Default 60s. Anything lower is considered a user
            or UI error.
+=======
+>>>>>>> 0.7.x:README
 
 db
 --

diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index de8326e3adcc481bb77272d4ba14965ea7c4c397..fea41b3971d3f9a77b342e6304f6e83e96fa6784 100644 (file)
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -51,6 +51,13 @@ class TwitapiusersAction extends TwitterapiAction
             return;
         }
 
+        $profile = $user->getProfile();
+
+        if (!$profile) {
+            common_server_error(_('User has no profile.'));
+            return;
+        }
+
         $twitter_user = $this->twitter_user_array($user->getProfile(), true);
 
         if ($apidata['content-type'] == 'xml') {