Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --cc classes/Notice.php
Simple merge

diff --cc lib/activityutils.php
Simple merge

diff --cc lib/framework.php
Simple merge

diff --cc lib/noticelistitem.php
Simple merge

diff --cc plugins/Activity/ActivityPlugin.php
Simple merge

diff --cc plugins/Event/EventPlugin.php
Simple merge

diff --cc plugins/Event/classes/RSVP.php
index c4ffc3ee340bb74ba09be17eac457161f10167e7,5c74bfee4f2e2a552f48f8faacd8690323d9ce48..0c39022b140433ccfba4a2cba5b940386a0f8bb4
--- 1/plugins/Event/classes/RSVP.php
--- 2/plugins/Event/classes/RSVP.php
+++ b/plugins/Event/classes/RSVP.php
@@@ -124,16 -124,39 +124,39 @@@ class RSVP extends Managed_DataObjec
          print "Resuming core schema upgrade...";
      }
  
 -    function saveNew($profile, $event, $verb, $options=array())
 +    function saveNew(Profile $profile, $event, $verb, array $options = array())
      {
-         if (array_key_exists('uri', $options)) {
-             $other = RSVP::getKV('uri', $options['uri']);
-             if (!empty($other)) {
-                 // TRANS: Client exception thrown when trying to save an already existing RSVP ("please respond").
-                 throw new ClientException(_m('RSVP already exists.'));
-             }
+         $eventNotice = $event->getNotice();
+         $options = array_merge(array('source' => 'web'), $options);
+ 
+         $act = new Activity();
+         $act->type    = ActivityObject::ACTIVITY;
+         $act->verb    = $verb;
+         $act->time    = $options['created'] ? strtotime($options['created']) : time();
+         $act->title   = _m("RSVP");
+         $act->actor   = $profile->asActivityObject();
+         $act->target  = $eventNotice->asActivityObject();
+         $act->objects = array(clone($act->target));
+         $act->content = RSVP::toHTML($profile, $event, self::codeFor($verb));
+ 
+         $act->id = common_local_url('showrsvp', array('id' => UUID::gen()));
+         $act->link = $act->id;
+ 
+         $saved = Notice::saveActivity($act, $profile, $options);
+ 
+         return $saved;
+     }
+ 
+     function saveNewFromNotice($notice, $event, $verb)
+     {
+         $other = RSVP::getKV('uri', $notice->uri);
+         if (!empty($other)) {
+             // TRANS: Client exception thrown when trying to save an already existing RSVP ("please respond").
+             throw new ClientException(_m('RSVP already exists.'));
          }
  
+         $profile = $notice->getProfile();
+ 
          try {
              $other = RSVP::getByKeys( [ 'profile_id' => $profile->getID(),
                                          'event_uri' => $event->getUri(),

diff --cc plugins/Favorite/classes/Fave.php
Simple merge