diff options
author | Brenda Wallace <shiny@cpan.org> | 2009-08-29 09:51:24 +1200 |
---|---|---|
committer | Brenda Wallace <shiny@cpan.org> | 2009-08-29 09:51:24 +1200 |
commit | 4c048ffec673905d2c90dd079ea35f12bc0b23cd (patch) | |
tree | 82902303385011b4b5ec3278162115e1ad021b44 /lib/twitterapi.php | |
parent | 8689955e0879d160f3fea31c3abdb97d64bc294f (diff) | |
parent | 72a60d63814188c7e282d678e281070070be5df2 (diff) |
Merge commit 'mainline/0.9.x' into 0.9.x
Diffstat (limited to 'lib/twitterapi.php')
-rw-r--r-- | lib/twitterapi.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/twitterapi.php b/lib/twitterapi.php index 9055d8b98..4612f74e9 100644 --- a/lib/twitterapi.php +++ b/lib/twitterapi.php @@ -595,7 +595,6 @@ class TwitterapiAction extends Action $this->init_document('rss'); - $this->elementStart('channel'); $this->element('title', null, $title); $this->element('link', null, $link); if (!is_null($suplink)) { @@ -621,7 +620,6 @@ class TwitterapiAction extends Action } } - $this->elementEnd('channel'); $this->end_twitter_rss(); } @@ -668,7 +666,6 @@ class TwitterapiAction extends Action $this->init_document('rss'); - $this->elementStart('channel'); $this->element('title', null, $title); $this->element('link', null, $link); $this->element('description', null, $subtitle); @@ -687,7 +684,6 @@ class TwitterapiAction extends Action } } - $this->elementEnd('channel'); $this->end_twitter_rss(); } @@ -944,11 +940,14 @@ class TwitterapiAction extends Action function init_twitter_rss() { $this->startXML(); - $this->elementStart('rss', array('version' => '2.0')); + $this->elementStart('rss', array('version' => '2.0', 'xmlns:atom'=>'http://www.w3.org/2005/Atom')); + $this->elementStart('channel'); + Event::handle('StartApiRss', array($this)); } function end_twitter_rss() { + $this->elementEnd('channel'); $this->elementEnd('rss'); $this->endXML(); } @@ -960,6 +959,7 @@ class TwitterapiAction extends Action $this->elementStart('feed', array('xmlns' => 'http://www.w3.org/2005/Atom', 'xml:lang' => 'en-US', 'xmlns:thr' => 'http://purl.org/syndication/thread/1.0')); + Event::handle('StartApiAtom', array($this)); } function end_twitter_atom() |