forked from GNUsocial/gnu-social
Merge branch 'master' of gitorious.org:statusnet/mainline
This commit is contained in:
commit
4d09d3c680
@ -117,7 +117,7 @@ class GroupProfileBlock extends ProfileBlock
|
||||
array('nickname' => $this->group->nickname)),
|
||||
// TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
|
||||
// TRANS: %s is the nickname of the group.
|
||||
'title' => sprintf(_m('TOOLTIP','Edit %s group properties'), $nickname)),
|
||||
'title' => sprintf(_m('TOOLTIP','Edit %s group properties'), $this->group->nickname)),
|
||||
// TRANS: Link text for link on user profile.
|
||||
_m('BUTTON','Edit'));
|
||||
$this->out->elementEnd('li');
|
||||
@ -126,7 +126,7 @@ class GroupProfileBlock extends ProfileBlock
|
||||
array('nickname' => $this->group->nickname)),
|
||||
// TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
|
||||
// TRANS: %s is the nickname of the group.
|
||||
'title' => sprintf(_m('TOOLTIP','Add or edit %s logo'), $nickname)),
|
||||
'title' => sprintf(_m('TOOLTIP','Add or edit %s logo'), $this->group->nickname)),
|
||||
// TRANS: Link text for link on user profile.
|
||||
_m('MENU','Logo'));
|
||||
$this->out->elementEnd('li');
|
||||
|
@ -206,7 +206,7 @@ class NeweventAction extends Action
|
||||
throw new ClientException(_m('Event must have an end time.'));
|
||||
}
|
||||
|
||||
if (isset($this->url) && Validate::uri($this->url) === false) {
|
||||
if (!empty($this->url) && Validate::uri($this->url) === false) {
|
||||
// TRANS: Client exception thrown when trying to post an event with an invalid URL.
|
||||
throw new ClientException(_m('URL must be valid.'));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user