X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnoticesearchrss.php;h=a59e7b99becfdb54b3fa2ca18476a7fee2b6b06f;hb=ddb656fcd2a3233b26e28987d2f3425944908d30;hp=b8fbd67e6243e2109bd12f52d552bdf0870f87fe;hpb=4737563b957e84ee06d07f373af533b2f037497a;p=quix0rs-gnu-social.git

diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index b8fbd67e62..a59e7b99be 100644
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -6,10 +6,10 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -41,10 +41,10 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class NoticesearchrssAction extends Rss10Action
 {
@@ -53,6 +53,13 @@ class NoticesearchrssAction extends Rss10Action
     {
         return true;
     }
+    
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $this->notices = $this->getNotices();
+        return true;
+    }
 
     function getNotices($limit=0)
     {
@@ -62,7 +69,7 @@ class NoticesearchrssAction extends Rss10Action
 
         $notice = new Notice();
 
-        $search_engine = $notice->getSearchEngine('identica_notices');
+        $search_engine = $notice->getSearchEngine('notice');
         $search_engine->set_sort_mode('chron');
 
         if (!$limit) $limit = 20;