From 20cb9fa28f865ecfcec31d5285950516172b8326 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 11 Mar 2010 17:16:37 -0500
Subject: foaf:holdsAccount is deprecated in favour of foaf:account. See
 http://lists.foaf-project.org/pipermail/foaf-dev/2009-December/009903.html
 for the news. Patch by Toby Inkster <mail@tobyinkster.co.uk>.

---
 actions/foafgroup.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'actions/foafgroup.php')

diff --git a/actions/foafgroup.php b/actions/foafgroup.php
index ebdf1cee2..d685554ac 100644
--- a/actions/foafgroup.php
+++ b/actions/foafgroup.php
@@ -146,7 +146,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 +154,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 +177,4 @@ class FoafGroupAction extends Action
         $this->elementEnd('Document');
     }
 
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-54-g00ecf


From eefde36fcf5c24c55fb8906374bac5c4c370cb54 Mon Sep 17 00:00:00 2001
From: Christopher Vollick <psycotica0@gmail.com>
Date: Fri, 9 Apr 2010 06:03:53 -0400
Subject: Undefined Variable in foafgroup.php

Probably just left over from the past.
---
 actions/foafgroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actions/foafgroup.php')

diff --git a/actions/foafgroup.php b/actions/foafgroup.php
index d685554ac..07cca3181 100644
--- 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);
-- 
cgit v1.2.3-54-g00ecf


From 2be04e2a631ea9f373386bed792e7233418e2ee2 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 9 Apr 2010 08:36:13 -0700
Subject: Avoid E_NOTICE spew when listing group members who aren't admins

---
 actions/foafgroup.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actions/foafgroup.php')

diff --git a/actions/foafgroup.php b/actions/foafgroup.php
index 07cca3181..4db40c28b 100644
--- a/actions/foafgroup.php
+++ b/actions/foafgroup.php
@@ -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));
         }
-- 
cgit v1.2.3-54-g00ecf