Merged stuff from upstream/master

[quix0rs-gnu-social.git] / plugins / Event / classes / RSVP.php

diff --git a/plugins/Event/classes/RSVP.php b/plugins/Event/classes/RSVP.php
index 90c9d25a8d74010fa318a6662a9b85a71e8dd7c6..7fa76d7151a390addf0ad6e41f170c3ce2793331 100644 (file)
--- a/plugins/Event/classes/RSVP.php
+++ b/plugins/Event/classes/RSVP.php
@@ -91,7 +91,11 @@ class RSVP extends Managed_DataObject
         );
     }
 
+<<<<<<< .merge_file_oq2F7C
     static public function beforeSchemaUpdate()
+=======
+    function saveNew(Profile $profile, $event, $verb, array $options = array())
+>>>>>>> .merge_file_L3oA6C
     {
         $table = strtolower(get_called_class());
         $schema = Schema::get();
@@ -125,7 +129,7 @@ class RSVP extends Managed_DataObject
         print "Resuming core schema upgrade...";
     }
 
-    function saveNew($profile, $event, $verb, $options=array())
+    function saveNew(Profile $profile, $event, $verb, array $options = array())
     {
         $eventNotice = $event->getNotice();
         $options = array_merge(array('source' => 'web'), $options);
@@ -319,7 +323,7 @@ class RSVP extends Managed_DataObject
                               $this->response);
     }
 
-    static function toHTML($profile, $event, $response)
+    static function toHTML(Profile $profile, Event $event, $response)
     {
         $fmt = null;