GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.9.x' into 1.0.x

Browse Source 
Conflicts:
	EVENTS.txt
	plugins/TwitterBridge/daemons/twitterstatusfetcher.php
	plugins/TwitterBridge/twitterbasicauthclient.php
This commit is contained in:
Evan Prodromou
2010-09-09 15:01:03 -04:00
parent 6f95ccd37d f2fd8b36f4
commit 4419e43f7f
63 changed files with 6660 additions and 2176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/apiaction.php
View File

@@ -303,7 +303,7 @@ class ApiAction extends Action
// StatusNet-specific
$twitter_user['statusnet:profile_url'] = $profile->profileurl;
$twitter_user['statusnet_profile_url'] = $profile->profileurl;
return $twitter_user;
}
@@ -408,7 +408,7 @@ class ApiAction extends Action
// StatusNet-specific
$twitter_status['statusnet:html'] = $notice->rendered;
$twitter_status['statusnet_html'] = $notice->rendered;
return $twitter_status;
}
@@ -620,7 +620,11 @@ class ApiAction extends Action
$this->showTwitterXmlStatus($value, 'retweeted_status');
break;
default:
$this->element($element, null, $value);
if (strncmp($element, 'statusnet_', 10) == 0) {
$this->element('statusnet:'.substr($element, 10), null, $value);
} else {
$this->element($element, null, $value);
}
}
}
$this->elementEnd($tag);
@@ -645,6 +649,8 @@ class ApiAction extends Action
foreach($twitter_user as $element => $value) {
if ($element == 'status') {
$this->showTwitterXmlStatus($twitter_user['status']);
} else if (strncmp($element, 'statusnet_', 10) == 0) {
$this->element('statusnet:'.substr($element, 10), null, $value);
} else {
$this->element($element, null, $value);
}