diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/action.php | 2 | ||||
| -rw-r--r-- | lib/apiaction.php | 12 | ||||
| -rw-r--r-- | lib/common.php | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/lib/action.php b/lib/action.php index a2638993f..e50397514 100644 --- a/lib/action.php +++ b/lib/action.php @@ -1007,7 +1007,7 @@ class Action extends HTMLOutputter // lawsuit if ($this->isCacheable()) { header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' ); header( "Cache-Control: private, must-revalidate, max-age=0" ); - header( "Pragma: underwear-catapult"); + header( "Pragma:"); } } 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); } diff --git a/lib/common.php b/lib/common.php index 422a639b8..0a0f5c631 100644 --- a/lib/common.php +++ b/lib/common.php @@ -22,10 +22,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } //exit with 200 response, if this is checking fancy from the installer if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } -define('STATUSNET_VERSION', '0.9.4'); +define('STATUSNET_VERSION', '0.9.5'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility -define('STATUSNET_CODENAME', 'Orange Crush'); +define('STATUSNET_CODENAME', 'What\'s The Frequency, Kenneth?'); define('AVATAR_PROFILE_SIZE', 96); define('AVATAR_STREAM_SIZE', 48); |