Merge remote branch 'origin/1.0.x' into 1.0.x

diff --git a/plugins/Event/RSVP.php b/plugins/Event/RSVP.php
index c61ff3dbf0619b46df01542a5146f4e1e36d6144..dc7166b9ce4972ff8d360deec89c21a46c3902cf 100644 (file)
--- a/plugins/Event/RSVP.php
+++ b/plugins/Event/RSVP.php
@@ -177,7 +177,8 @@ class RSVP extends Managed_DataObject
 
         $content = sprintf(_('RSVPed %s for an event.'),
                            ($result == RSVP::POSITIVE) ? _('positively') :
-                           ($result == RSVP::NEGATIVE) ? _('negatively') : _('possibly'));
+                           ($result == RSVP::NEGATIVE) ? _('negatively') :
+                           _('possibly'));
         
         $rendered = $content;
 
@@ -231,7 +232,9 @@ class RSVP extends Managed_DataObject
 
     static function forEvent($event)
     {
-        $rsvps = array(RSVP::POSITIVE => array(), RSVP::NEGATIVE => array(), RSVP::POSSIBLE => array());
+        $rsvps = array(RSVP::POSITIVE => array(),
+                       RSVP::NEGATIVE => array(),
+                       RSVP::POSSIBLE => array());
 
         $rsvp = new RSVP();