diff options
author | Evan Prodromou <evan@status.net> | 2009-08-27 11:16:45 -0700 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-08-27 11:16:45 -0700 |
commit | 5d09b6b3f0595540c66b703ae085f0af904fe30f (patch) | |
tree | 59269a4dacf90bbab9f0ff63afff4bf1781a1240 /actions/twitapitags.php | |
parent | f1fda6c0503e32edfc99b297f4bf2cb07e629d9e (diff) | |
parent | 82b0927f5838f3c12816e03712df9460a9f77b72 (diff) |
Merge branch '0.8.x' into 0.9.x
Conflicts:
EVENTS.txt
actions/finishremotesubscribe.php
actions/postnotice.php
actions/public.php
actions/remotesubscribe.php
actions/showstream.php
actions/updateprofile.php
actions/userauthorization.php
classes/laconica.ini
lib/common.php
lib/oauthstore.php
lib/omb.php
Diffstat (limited to 'actions/twitapitags.php')
-rw-r--r-- | actions/twitapitags.php | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/actions/twitapitags.php b/actions/twitapitags.php index e19e1b1ed..2bb7ee01a 100644 --- a/actions/twitapitags.php +++ b/actions/twitapitags.php @@ -1,8 +1,8 @@ <?php /** - * Laconica, the distributed open-source microblogging tool + * StatusNet, the distributed open-source microblogging tool * - * Laconica extensions to the Twitter-like API for groups + * StatusNet extensions to the Twitter-like API for groups * * PHP version 5 * @@ -20,15 +20,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * * @category Twitter - * @package Laconica + * @package StatusNet * @author Craig Andrews - * @author Zach Copley <zach@controlyourself.ca> - * @copyright 2009 Control Yourself, Inc. + * @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://laconi.ca/ + * @link http://status.net/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } @@ -37,15 +37,15 @@ require_once INSTALLDIR.'/lib/twitterapi.php'; /** * Group-specific API methods * - * This class handles Laconica group API methods. + * This class handles StatusNet group API methods. * * @category Twitter - * @package Laconica + * @package StatusNet * @author Craig Andrews - * @author Zach Copley <zach@controlyourself.ca> - * @copyright 2009 Control Yourself, Inc. + * @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://laconi.ca/ + * @link http://status.net/ */ class TwitapitagsAction extends TwitterapiAction @@ -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); |