diff options
| author | Evan Prodromou <evan@status.net> | 2010-09-09 15:01:03 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-09-09 15:01:03 -0400 |
| commit | 4419e43f7f62d92f01ba8f844aa9cd472051dd84 (patch) | |
| tree | 4c80501a0306c1cddd2427685824bef62683020b /lib/apiaction.php | |
| parent | 6f95ccd37de1f7e2063206e87c93cbe06097eae7 (diff) | |
| parent | f2fd8b36f4a932f50770c84d769297bcfc1c1483 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
EVENTS.txt
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
plugins/TwitterBridge/twitterbasicauthclient.php
Diffstat (limited to 'lib/apiaction.php')
| -rw-r--r-- | lib/apiaction.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/apiaction.php b/lib/apiaction.php index bb39e4e51..b4252db95 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -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); } |