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/twitapitrends.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/twitapitrends.php')
| -rw-r--r-- | actions/twitapitrends.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php index 83ab28f35..779405e6d 100644 --- a/actions/twitapitrends.php +++ b/actions/twitapitrends.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/twitterapi.php'; +require_once INSTALLDIR.'/lib/api.php'; /** * Returns the top ten queries that are currently trending @@ -42,10 +42,10 @@ require_once INSTALLDIR.'/lib/twitterapi.php'; * @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 TwitapitrendsAction extends TwitterapiAction +class TwitapitrendsAction extends ApiAction { var $callback; |