From ebaf5a972ef88947d70b6e52393cb600402e7148 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 27 Aug 2011 14:56:02 -0400
Subject: [PATCH] add a return to the error path for new events

---
 plugins/Event/Happening.php | 6 +++---
 plugins/Event/newevent.php  | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/Event/Happening.php b/plugins/Event/Happening.php
index 840f1f0061..b8347bdb2c 100644
--- a/plugins/Event/Happening.php
+++ b/plugins/Event/Happening.php
@@ -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> - '.
diff --git a/plugins/Event/newevent.php b/plugins/Event/newevent.php
index 2704501abd..1bfcddba34 100644
--- a/plugins/Event/newevent.php
+++ b/plugins/Event/newevent.php
@@ -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();