Merge branch '0.9.x-mobile' of git@gitorious.org:~csarven/statusnet/csarven-clone...

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

diff --git a/actions/twitapitags.php b/actions/twitapitags.php
index f889ae8c0398733662f62c366dd0a63edc06557f..0bcc55d378faa869739a491cc8baaf5a8a4638d0 100644 (file)
--- a/actions/twitapitags.php
+++ b/actions/twitapitags.php
@@ -21,14 +21,14 @@
  *
  * @category  Twitter
  * @package   StatusNet
- * @author    Craig Andrews
+ * @author    Craig Andrews <candrews@integralblue.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  *
  * @category  Twitter
  * @package   StatusNet
- * @author    Craig Andrews
+ * @author    Craig Andrews <candrews@integralblue.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -93,11 +93,11 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
           case 'atom':
              if (isset($apidata['api_arg'])) {
                  $selfuri = common_root_url() .
-                     'api/laconica/tags/timeline/' .
+                     'api/statusnet/tags/timeline/' .
                          $apidata['api_arg'] . '.atom';
              } else {
                  $selfuri = common_root_url() .
-                  'api/laconica/tags/timeline.atom';
+                  'api/statusnet/tags/timeline.atom';
              }
              $this->show_atom_timeline($notice, $title, $id, $link,
                  $subtitle, null, $selfuri);