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

Merge remote branch 'gitorious/master'

Browse Source
This commit is contained in:
Evan Prodromou
2010-10-29 11:14:00 -04:00
parent c8dab140f4 fb0c3f4f99
commit 36baff3d41
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
actions/showgroup.php
View File

@@ -298,12 +298,12 @@ class ShowgroupAction extends GroupDesignAction
$this->elementEnd('div'); $this->elementEnd('div');
$cur = common_current_user();
$this->elementStart('div', 'entity_actions'); $this->elementStart('div', 'entity_actions');
$this->element('h2', null, _('Group actions')); $this->element('h2', null, _('Group actions'));
$this->elementStart('ul'); $this->elementStart('ul');
$this->elementStart('li', 'entity_subscribe'); $this->elementStart('li', 'entity_subscribe');
if (Event::handle('StartGroupSubscribe', array($this, $this->group))) { if (Event::handle('StartGroupSubscribe', array($this, $this->group))) {
$cur = common_current_user();
if ($cur) { if ($cur) {
if ($cur->isMember($this->group)) { if ($cur->isMember($this->group)) {
$lf = new LeaveForm($this, $this->group); $lf = new LeaveForm($this, $this->group);
@@ -316,7 +316,7 @@ class ShowgroupAction extends GroupDesignAction
Event::handle('EndGroupSubscribe', array($this, $this->group)); Event::handle('EndGroupSubscribe', array($this, $this->group));
} }
$this->elementEnd('li'); $this->elementEnd('li');
if ($cur->hasRight(Right::DELETEGROUP)) { if ($cur && $cur->hasRight(Right::DELETEGROUP)) {
$this->elementStart('li', 'entity_delete'); $this->elementStart('li', 'entity_delete');
$df = new DeleteGroupForm($this, $this->group); $df = new DeleteGroupForm($this, $this->group);
$df->show(); $df->show();

7
lib/ping.php
View File

@@ -27,7 +27,14 @@ function ping_broadcast_notice($notice) {
# Array of servers, URL => type # Array of servers, URL => type
$notify = common_config('ping', 'notify'); $notify = common_config('ping', 'notify');
try {
$profile = $notice->getProfile(); $profile = $notice->getProfile();
} catch (Exception $e) {
// @todo: distinguish the 'broken notice/profile' case from more general
// transitory errors.
common_log(LOG_ERR, "Exception getting notice profile: " . $e->getMessage());
return true;
}
$tags = ping_notice_tags($notice); $tags = ping_notice_tags($notice);
foreach ($notify as $notify_url => $type) { foreach ($notify as $notify_url => $type) {