Merge pull request #6485 from MrPetovan/bug/fixes-after-2019-03-develop-rebase

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

diff --git a/src/Model/Event.php b/src/Model/Event.php
index cd08c314afa5ffe521a3fab5305f4037499acf59..3ce86017ba99028203aeb946a09c1a70bbe530cb 100644 (file)
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -644,15 +644,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