From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 10 Jul 2009 17:03:57 +0000 (-0700)
Subject: Merge branch '0.7.x' into 0.8.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bafa1ab1c532118e2230df50ed18a1b4573692b7;p=quix0rs-gnu-social.git

Merge branch '0.7.x' into 0.8.x

Conflicts:
	README
	actions/twitapiusers.php
---

bafa1ab1c532118e2230df50ed18a1b4573692b7
diff --cc README
index 8622d37970,679a096b3b..40e5263550
--- a/README
+++ b/README
@@@ -953,12 -904,6 +953,15 @@@ sslserver: use an alternate server nam
  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 --cc actions/twitapiusers.php
index de8326e3ad,a47fdfbc38..fea41b3971
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@@ -51,7 -49,14 +51,14 @@@ class TwitapiusersAction extends Twitte
              return;
          }
  
+         $profile = $user->getProfile();
+ 
+         if (!$profile) {
+             common_server_error(_('User has no profile.'));
+             return;
+         }
+ 
 -        $twitter_user = $this->twitter_user_array($profile, true);
 +        $twitter_user = $this->twitter_user_array($user->getProfile(), true);
  
          if ($apidata['content-type'] == 'xml') {
              $this->init_document('xml');