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

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

diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 66b67a030e0899bf3aceb60e6ae568d748d6af59..98fdb0497a3c3bb5e59194d254d25d04abc0e901 100644 (file)
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -93,7 +93,7 @@ class ApiGroupListAction extends ApiBareAuthAction
 
         $sitename   = common_config('site', 'name');
         $title      = sprintf(_("%s's groups"), $this->user->nickname);
-        $taguribase = common_config('integration', 'taguri');
+        $taguribase = TagURI::base();
         $id         = "tag:$taguribase:Groups";
         $link       = common_local_url(
             'usergroups',
@@ -152,8 +152,7 @@ class ApiGroupListAction extends ApiBareAuthAction
             ($this->page - 1) * $this->count,
             $this->count,
             $this->since_id,
-            $this->max_id,
-            $this->since
+            $this->max_id
         );
 
         while ($group->fetch()) {