Updated ShowGroup to Resolve Aliases Again.

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

diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php
index c628ee624a2a3498d7ff4a24cf329f6663a127f8..b5c006aa7b9f85f86463b30e9cb61dbcbccc54f6 100644 (file)
--- a/actions/twitapisearchjson.php
+++ b/actions/twitapisearchjson.php
@@ -31,7 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/twitterapi.php';
 require_once INSTALLDIR.'/lib/jsonsearchresultslist.php';
 
 /**
@@ -42,10 +41,10 @@ require_once INSTALLDIR.'/lib/jsonsearchresultslist.php';
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
- * @see      TwitterapiAction
+ * @see      ApiAction
  */
 
-class TwitapisearchjsonAction extends TwitterapiAction
+class TwitapisearchjsonAction extends ApiAction
 {
     var $query;
     var $lang;
@@ -121,7 +120,7 @@ class TwitapisearchjsonAction extends TwitterapiAction
         // lcase it for comparison
         $q = strtolower($this->query);
 
-        $search_engine = $notice->getSearchEngine('identica_notices');
+        $search_engine = $notice->getSearchEngine('notice');
         $search_engine->set_sort_mode('chron');
         $search_engine->limit(($this->page - 1) * $this->rpp, $this->rpp + 1, true);
         if (false === $search_engine->query($q)) {
@@ -134,9 +133,9 @@ class TwitapisearchjsonAction extends TwitterapiAction
 
         $results = new JSONSearchResultsList($notice, $q, $this->rpp, $this->page);
 
-        $this->init_document('json');
+        $this->initDocument('json');
         $results->show();
-        $this->end_document('json');
+        $this->endDocument('json');
     }
 
     /**