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

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

diff --git a/actions/foafgroup.php b/actions/foafgroup.php
index ebdf1cee2567555748fe04e9423203f4f1a7131b..4db40c28bef2529e7407065bb837490e50abfc5e 100644 (file)
--- a/actions/foafgroup.php
+++ b/actions/foafgroup.php
@@ -56,7 +56,7 @@ class FoafGroupAction extends Action
             return false;
         }
 
-        $local = Local_group::staticGet('nickname', $nickname);
+        $local = Local_group::staticGet('nickname', $this->nickname);
 
         if (!$local) {
             $this->clientError(_('No such group.'), 404);
@@ -126,7 +126,8 @@ class FoafGroupAction extends Action
         while ($members->fetch()) {
             $member_uri = common_local_url('userbyid', array('id'=>$members->id));
             $member_details[$member_uri] = array(
-                                        'nickname' => $members->nickname
+                                        'nickname' => $members->nickname,
+                                        'is_admin' => false,
                                         );
             $this->element('member', array('rdf:resource' => $member_uri));
         }
@@ -146,7 +147,7 @@ class FoafGroupAction extends Action
             {
                 $this->elementStart('Agent', array('rdf:about' => $uri));
                 $this->element('nick', null, $details['nickname']);
-                $this->elementStart('holdsAccount');
+                $this->elementStart('account');
                 $this->elementStart('sioc:User', array('rdf:about'=>$uri.'#acct'));
                 $this->elementStart('sioc:has_function');
                 $this->elementStart('statusnet:GroupAdminRole');
@@ -154,7 +155,7 @@ class FoafGroupAction extends Action
                 $this->elementEnd('statusnet:GroupAdminRole');
                 $this->elementEnd('sioc:has_function');
                 $this->elementEnd('sioc:User');
-                $this->elementEnd('holdsAccount');
+                $this->elementEnd('account');
                 $this->elementEnd('Agent');
             }
             else
@@ -177,4 +178,4 @@ class FoafGroupAction extends Action
         $this->elementEnd('Document');
     }
 
-}
\ No newline at end of file
+}