Merge pull request #5561 from MrPetovan/bug/4584-fix-twitter-gif-still-image

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

diff --git a/src/Model/Event.php b/src/Model/Event.php
index da386a77b7dbd39540d9fe11916f19f878a48775..1bc922b4653ab73144d0ecc52f95a73ab0468841 100644 (file)
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -48,9 +48,13 @@ class Event extends BaseObject
                }
 
                if ($simple) {
-                       $o = "<h3>" . BBCode::convert($event['summary'], false, $simple) . "</h3>";
+                       if (!empty($event['summary'])) {
+                               $o = "<h3>" . BBCode::convert($event['summary'], false, $simple) . "</h3>";
+                       }
 
-                       $o .= "<div>" . BBCode::convert($event['desc'], false, $simple) . "</div>";
+                       if (!empty($event['desc'])) {
+                               $o .= "<div>" . BBCode::convert($event['desc'], false, $simple) . "</div>";
+                       }
 
                        $o .= "<h4>" . L10n::t('Starts:') . "</h4><p>" . $event_start . "</p>";
 
@@ -76,14 +80,16 @@ class Event extends BaseObject
 
                if (!$event['nofinish']) {
                        $o .= '<div class="event-end" ><span class="event-label">' . L10n::t('Finishes:') . '</span>&nbsp;<span class="dtend" title="'
-                               . DateTimeFormat::utc($event['finish'], (($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
+                               . DateTimeFormat::utc($event['finish'], (!empty($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
                                . '" >' . $event_end
                                . '</span></div>' . "\r\n";
                }
 
-               $o .= '<div class="description event-description">' . BBCode::convert($event['desc'], false, $simple) . '</div>' . "\r\n";
+               if (!empty($event['desc'])) {
+                       $o .= '<div class="description event-description">' . BBCode::convert($event['desc'], false, $simple) . '</div>' . "\r\n";
+               }
 
-               if (strlen($event['location'])) {
+               if (!empty($event['location'])) {
                        $o .= '<div class="event-location"><span class="event-label">' . L10n::t('Location:') . '</span>&nbsp;<span class="location">'
                                . BBCode::convert($event['location'], false, $simple)
                                . '</span></div>' . "\r\n";
@@ -307,7 +313,7 @@ class Event extends BaseObject
 
                        Addon::callHooks('event_updated', $event['id']);
                } else {
-                       $event['guid'] = System::createGUID(32);
+                       $event['guid']  = defaults($arr, 'guid', System::createGUID(32));
 
                        // New event. Store it.
                        DBA::insert('event', $event);
@@ -321,6 +327,7 @@ class Event extends BaseObject
                        $item_arr['uri']           = $event['uri'];
                        $item_arr['parent-uri']    = $event['uri'];
                        $item_arr['guid']          = $event['guid'];
+                       $item_arr['plink']         = defaults($arr, 'plink', '');
                        $item_arr['post-type']     = Item::PT_EVENT;
                        $item_arr['wall']          = $event['cid'] ? 0 : 1;
                        $item_arr['contact-id']    = $contact['id'];