X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FEvent.php;h=d8657c1e9a61a2c706fde9c89131150ba8f0fa58;hb=ce3b1210640ce653ef91cbf033788474c1f88b0c;hp=cd08c314afa5ffe521a3fab5305f4037499acf59;hpb=7f2dc4060119f49eaaefb01ce3f32907e4c7761d;p=friendica.git

diff --git a/src/Model/Event.php b/src/Model/Event.php
index cd08c314af..d8657c1e9a 100644
--- 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);
 
@@ -644,15 +643,17 @@ class Event extends BaseObject
 	 */
 	private static function formatListForExport(array $events, $format)
 	{
+		$o = '';
+
 		if (!count($events)) {
-			return '';
+			return $o;
 		}
 
 		switch ($format) {
 			// Format the exported data as a CSV file.
 			case "csv":
 				header("Content-type: text/csv");
-				$o = '"Subject", "Start Date", "Start Time", "Description", "End Date", "End Time", "Location"' . PHP_EOL;
+				$o .= '"Subject", "Start Date", "Start Time", "Description", "End Date", "End Time", "Location"' . PHP_EOL;
 
 				foreach ($events as $event) {
 					/// @todo The time / date entries don't include any information about the