eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '0.7.x' into 0.8.x

Browse Source 
Conflicts:
	README
	actions/twitapiusers.php
This commit is contained in:
Evan Prodromou 2009-07-10 10:03:57 -07:00
commit bafa1ab1c5
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README
View File

@ -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 shorturllength: Length of URL at which URLs in a message exceeding 140
characters will be sent to the user's chosen characters will be sent to the user's chosen
shortening service. shortening service.
<<<<<<< HEAD:README
design: a default design (colors and background) for the site. design: a default design (colors and background) for the site.
Sub-items are: backgroundcolor, contentcolor, sidebarcolor, Sub-items are: backgroundcolor, contentcolor, sidebarcolor,
textcolor, linkcolor, backgroundimage, disposition. textcolor, linkcolor, backgroundimage, disposition.
dupelimit: minimum time allowed for one person to say the same thing dupelimit: minimum time allowed for one person to say the same thing
twice. Default 60s. Anything lower is considered a user twice. Default 60s. Anything lower is considered a user
or UI error. or UI error.
=======
>>>>>>> 0.7.x:README
db db
-- --

7
actions/twitapiusers.php
View File

@ -51,6 +51,13 @@ class TwitapiusersAction extends TwitterapiAction
return; return;
} }
$profile = $user->getProfile();
if (!$profile) {
common_server_error(_('User has no profile.'));
return;
}
$twitter_user = $this->twitter_user_array($user->getProfile(), true); $twitter_user = $this->twitter_user_array($user->getProfile(), true);
if ($apidata['content-type'] == 'xml') { if ($apidata['content-type'] == 'xml') {