Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

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

diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index 67bca01b53540d58105e6b1e8dd5926d5ebe07e1..18f07f85586b1b35404e549583e73d7db8eb0060 100644 (file)
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -62,7 +62,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;