Do not add a new line if file storage mode append but existing file w…

…as empty
dmolineus · Jul 7, 2015 · cd07d51 · cd07d51
1 parent 852733f
commit cd07d51
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Notification Center Changelog
 ===========================
 
+Version 1.3.0 (2015-??-??)
+---------------------------------
+
+### Fixed
+- Do not add a new line if file storage mode append but existing file was empty
+
+
 Version 1.3.0-rc1 (2015-07-07)
 ---------------------------------
 

diff --git a/library/NotificationCenter/Gateway/File.php b/library/NotificationCenter/Gateway/File.php
@@ -173,7 +173,11 @@ protected function saveToLocal($strFileName, $strContent, $strStorageMode)
 
         $objFile = new \File($this->objModel->file_path . '/' . $strFileName);
 
-        if ($strStorageMode === self::FILE_STORAGE_APPEND) {
+        // Don't start with a newline
+        if ($strStorageMode === self::FILE_STORAGE_APPEND
+            && $objFile->exists()
+            && $objFile->getContent() !== ''
+        ) {
             $strContent = $objFile->getContent() . "\n" . $strContent;
         }
 
@@ -223,7 +227,10 @@ protected function saveToFTP($strFileName, $strContent, $strStorageMode)
             $fileContents = ob_get_contents();
             ob_end_clean();
 
-            $strContent .= $fileContents . "\n" . $strContent;
+            // Don't start with a newline
+            if ($fileContents !== '') {
+                $strContent .= $fileContents . "\n" . $strContent;
+            }
         }
 
         // Write content to temporary file