Twitter-compatible API - moved show() to the right file

[quix0rs-gnu-social.git] / actions / noticesearchrss.php

diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index f5834c4c1c8a892ba50ef9210a05472f5c9d7be8..c9d08ce8e77c1d2ba9af5f09b49a65c7b69a6252 100644 (file)
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -28,44 +28,45 @@ class NoticesearchrssAction extends Rss10Action {
        function init() {
                return true;
        }
-       
+
        function get_notices($limit=0) {
 
                $q = $this->trimmed('q');
                $notices = array();
-               
+
                $notice = new Notice();
 
                # lcase it for comparison
                $q = strtolower($q);
-               
+
                $notice->whereAdd('MATCH(content) against (\''.addslashes($q).'\')');
+               $notice->orderBy('created DESC, notice.id DESC');
 
                # Ask for an extra to see if there's more.
-               
+
                if ($limit != 0) {
                        $notice->limit(0, $limit);
                }
 
                $notice->find();
-               
+
                while ($notice->fetch()) {
                        $notices[] = clone($notice);
                }
-               
+
                return $notices;
        }
-       
+
        function get_channel() {
                global $config;
                $q = $this->trimmed('q');
                $c = array('url' => common_local_url('noticesearchrss', array('q' => $q)),
-                                  'title' => $config['site']['name'] . _t(' Search Stream for "' . $q . '"'),
+                                  'title' => $config['site']['name'] . sprintf(_(' Search Stream for "%s"'), $q),
                                   'link' => common_local_url('noticesearch', array('q' => $q)),
-                                  'description' => _t('All updates matching search term "') . $q . '"');
+                                  'description' => sprintf(_('All updates matching search term "%s"'), $q));
                return $c;
        }
-       
+
        function get_image() {
                return NULL;
        }