Merge pull request #6747 from nupplaphil/issue/6677-frio_admin

[friendica.git] / src / Model / Event.php

diff --git a/src/Model/Event.php b/src/Model/Event.php
index 3ce86017ba99028203aeb946a09c1a70bbe530cb..d8657c1e9a61a2c706fde9c89131150ba8f0fa58 100644 (file)
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -245,7 +245,8 @@ class Event extends BaseObject
                $event['id']        = intval(defaults($arr, 'id'       , 0));
                $event['uid']       = intval(defaults($arr, 'uid'      , 0));
                $event['cid']       = intval(defaults($arr, 'cid'      , 0));
-               $event['uri']       =        defaults($arr, 'uri'      , Item::newURI($event['uid']));
+               $event['guid']      =        defaults($arr, 'guid'     , System::createUUID());
+               $event['uri']       =        defaults($arr, 'uri'      , Item::newURI($event['uid'], $event['guid']));
                $event['type']      =        defaults($arr, 'type'     , 'event');
                $event['summary']   =        defaults($arr, 'summary'  , '');
                $event['desc']      =        defaults($arr, 'desc'     , '');
@@ -316,8 +317,6 @@ class Event extends BaseObject
 
                        Hook::callAll('event_updated', $event['id']);
                } else {
-                       $event['guid']  = defaults($arr, 'guid', System::createUUID());
-
                        // New event. Store it.
                        DBA::insert('event', $event);