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

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

diff --git a/actions/usergroups.php b/actions/usergroups.php
index 0260961baa8ceb00e537b07aa492fcd7cee0bba1..504226143280bfff9f11e03b9cf2a5e3ca96632c 100644 (file)
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -21,14 +21,14 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-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);
 }
 
@@ -41,9 +41,9 @@ require_once INSTALLDIR.'/lib/grouplist.php';
  *
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @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 UsergroupsAction extends OwnerDesignAction
@@ -61,7 +61,7 @@ class UsergroupsAction extends OwnerDesignAction
         if ($this->page == 1) {
             return sprintf(_("%s groups"), $this->user->nickname);
         } else {
-            return sprintf(_("%s groups, page %d"),
+            return sprintf(_("%1$s groups, page %2$d"),
                            $this->user->nickname,
                            $this->page);
         }