GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

This commit is contained in:
CiaranG 2009-03-08 09:25:23 +00:00
parent 61940e37ff f66775658c
commit a5b9f59cb2
4 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actions/leavegroup.php
View File

@ -96,12 +96,6 @@ class LeavegroupAction extends Action
return false;
}
if ($cur->isAdmin($this->group)) {
$this->clientError(_('You may not leave a group while you are its administrator.'), 403);
return false;
}
return true;
}

6
actions/showgroup.php
View File

@ -275,10 +275,8 @@ class ShowgroupAction extends Action
$cur = common_current_user();
if ($cur) {
if ($cur->isMember($this->group)) {
if (!$cur->isAdmin($this->group)) {
$lf = new LeaveForm($this, $this->group);
$lf->show();
}
$lf = new LeaveForm($this, $this->group);
$lf->show();
} else {
$jf = new JoinForm($this, $this->group);
$jf->show();

2
classes/Notice.php
View File

@ -234,7 +234,7 @@ class Notice extends Memcached_DataObject
$notice->content = $content;
$notice->whereAdd('now() - created < ' . common_config('notice', 'dupelimit'));
$cnt = $notice->count();
return ($cnt > 0);
return ($cnt == 0);
}
static function checkEditThrottle($profile_id) {

6
lib/grouplist.php
View File

@ -164,10 +164,8 @@ class GroupList extends Widget
# XXX: special-case for user looking at own
# subscriptions page
if ($user->isMember($this->group)) {
if (!$user->isAdmin($this->group)) {
$lf = new LeaveForm($this->out, $this->group);
$lf->show();
}
$lf = new LeaveForm($this->out, $this->group);
$lf->show();
} else {
$jf = new JoinForm($this->out, $this->group);
$jf->show();