diff options
| author | Brion Vibber <brion@pobox.com> | 2009-10-13 08:21:55 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2009-10-13 08:21:55 -0700 |
| commit | 7021dd9341635090207a39ea8f74558e243c874f (patch) | |
| tree | d1df804666cdd88993ded76a4f2a29bdcdfc28ff /actions/twitapisearchjson.php | |
| parent | 712db3a89741c423f91f43bcbeb2650d5d5d5205 (diff) | |
| parent | 16243737606d4e1f29a94e07369e69f430d3ecc8 (diff) | |
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/twitapisearchjson.php')
| -rw-r--r-- | actions/twitapisearchjson.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php index c628ee624..c7fa741a0 100644 --- a/actions/twitapisearchjson.php +++ b/actions/twitapisearchjson.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/twitterapi.php'; +require_once INSTALLDIR.'/lib/api.php'; require_once INSTALLDIR.'/lib/jsonsearchresultslist.php'; /** @@ -42,10 +42,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; @@ -134,9 +134,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'); } /** |