summaryrefslogtreecommitdiff
path: root/actions/foafgroup.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2010-04-18 19:21:15 -0400
committerCraig Andrews <candrews@integralblue.com>2010-04-18 19:21:15 -0400
commit39392e03a71d94d6b984033b994b417edfc2d8d6 (patch)
treecb3ae36fc9a20a4cd884e271ef36dcce28f109c8 /actions/foafgroup.php
parent727ea5a5163249eb40fa0c4b2c63054fc997473b (diff)
parent23bad16bba52a09f0cea3d2c40e6cf91e2945e37 (diff)
Merge branch '0.9.x' into 1.0.x
Conflicts: actions/confirmaddress.php actions/imsettings.php
Diffstat (limited to 'actions/foafgroup.php')
-rw-r--r--actions/foafgroup.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/actions/foafgroup.php b/actions/foafgroup.php
index d685554ac..4db40c28b 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);
@@ -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));
}