Commit 26b0bc3a authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

parents 880d0b47 7763f804
......@@ -78,6 +78,62 @@ class NoticesearchAction extends SearchAction
return _('Text search');
}
function showExportData()
{
$q = $this->trimmed('q');
if (!$q) {
return;
}
$fl = new FeedList($this);
$fl->show(array(0 => array('href' => common_local_url('noticesearchrss', array('q' => $q)),
'type' => 'rss',
'version' => 'RSS 1.0',
'item' => 'noticesearchrss')));
}
function showFeeds()
{
$q = $this->trimmed('q');
if (!$q) {
return;
}
$this->element('link', array('rel' => 'alternate',
'href' => common_local_url('noticesearchrss',
array('q' => $q)),
'type' => 'application/rss+xml',
'title' => _('Search Stream Feed')));
}
/**
* Show header
*
* @param array $arr array containing the query
*
* @return void
*/
function extraHead2()
{
$q = $this->trimmed('q');
if ($q) {
$this->element('link', array('rel' => 'alternate',
'href' => common_local_url('noticesearchrss',
array('q' => $q)),
'type' => 'application/rss+xml',
'title' => _('Search Stream Feed')));
}
}
/**
* Show results
*
......@@ -119,26 +175,6 @@ class NoticesearchAction extends SearchAction
$page, 'noticesearch', array('q' => $q));
}
/**
* Show header
*
* @param array $arr array containing the query
*
* @return void
*/
function extraHead()
{
$q = $this->trimmed('q');
if ($q) {
$this->element('link', array('rel' => 'alternate',
'href' => common_local_url('noticesearchrss',
array('q' => $q)),
'type' => 'application/rss+xml',
'title' => _('Search Stream Feed')));
}
}
/**
* Show notice
*
......
......@@ -112,6 +112,13 @@ class FeedList extends Widget
$feed['textContent'] = "Atom";
break;
case 'noticesearchrss':
$feed_classname = $feed['type'];
$feed_mimetype = "application/".$feed['type']."+xml";
$feed_title = $feed['version']." feed for this notice search";
$feed['textContent'] = "RSS";
break;
case 'tagrss':
$feed_classname = $feed['type'];
$feed_mimetype = "application/".$feed['type']."+xml";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment