Merge branch 'master' of gitorious.org:statusnet/mainline into testing

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

diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php
index 2d17e77cc8e06bbf45bbc6f31f0204fe1890be03..5a04569a22d8d8fbb3d474ee83bbd378678912cc 100644 (file)
--- a/actions/twitapitrends.php
+++ b/actions/twitapitrends.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/api.php';
-
 /**
  *  Returns the top ten queries that are currently trending
  *
@@ -55,7 +53,7 @@ class TwitapitrendsAction extends ApiAction
      *
      * @param array $args Web and URL arguments
      *
-     * @return boolean false if user does not exist
+     * @return boolean false if user doesn't exist
      */
     function prepare($args)
     {