forked from GNUsocial/gnu-social
add a return to the error path for new events
This commit is contained in:
parent
8501ddf0ee
commit
ebaf5a972e
@ -155,7 +155,7 @@ class Happening extends Managed_DataObject
|
||||
// XXX: does this get truncated?
|
||||
|
||||
// TRANS: Event description. %1$s is a title, %2$s is start time, %3$s is end time,
|
||||
// TRANS: %4$s is location, %5$s is a description.
|
||||
// TRANS: %4$s is location, %5$s is a description.
|
||||
$content = sprintf(_m('"%1$s" %2$s - %3$s (%4$s): %5$s'),
|
||||
$title,
|
||||
common_exact_date($ev->start_time),
|
||||
@ -164,8 +164,8 @@ class Happening extends Managed_DataObject
|
||||
$description);
|
||||
|
||||
// TRANS: Rendered event description. %1$s is a title, %2$s is start time, %3$s is start time,
|
||||
// TRANS: %4$s is end time, %5$s is end time, %6$s is location, %7$s is description.
|
||||
// TRANS: Class names should not be translated.
|
||||
// TRANS: %4$s is end time, %5$s is end time, %6$s is location, %7$s is description.
|
||||
// TRANS: Class names should not be translated.
|
||||
$rendered = sprintf(_m('<span class="vevent">'.
|
||||
'<span class="summary">%1$s</span> '.
|
||||
'<abbr class="dtstart" title="%2$s">%3$s</a> - '.
|
||||
|
@ -233,6 +233,7 @@ class NeweventAction extends Action
|
||||
} catch (ClientException $ce) {
|
||||
if ($this->boolean('ajax')) {
|
||||
$this->outputAjaxError($ce->getMessage());
|
||||
return;
|
||||
} else {
|
||||
$this->error = $ce->getMessage();
|
||||
$this->showPage();
|
||||
|
Loading…
Reference in New Issue
Block a user