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 f6b8c0aa7c847a2a28509132f8a6d9ebe8209df0..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();