X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FFileUtils.php;h=ba409821c03c0b235e0b9ea86151c6bbf30bc911;hb=fb1b182fbf0ee5afed586f77eec84d7a906831ef;hp=a167f642acd925ce7955c92fa6c9d559103f2ea9;hpb=b2e2aa42e288e0becaa95bf9cc3be679743fc98e;p=github%2Fshaarli%2FShaarli.git

diff --git a/application/FileUtils.php b/application/FileUtils.php
index a167f642..ba409821 100644
--- a/application/FileUtils.php
+++ b/application/FileUtils.php
@@ -1,5 +1,7 @@
 <?php
 
+use Shaarli\Exceptions\IOException;
+
 require_once 'exceptions/IOException.php';
 
 /**
@@ -37,7 +39,7 @@ class FileUtils
         if (is_file($file) && !is_writeable($file)) {
             // The datastore exists but is not writeable
             throw new IOException($file);
-        } else if (!is_file($file) && !is_writeable(dirname($file))) {
+        } elseif (!is_file($file) && !is_writeable(dirname($file))) {
             // The datastore does not exist and its parent directory is not writeable
             throw new IOException(dirname($file));
         }
@@ -50,7 +52,8 @@ class FileUtils
 
     /**
      * Read data from a file containing Shaarli database format content.
-     * If the file isn't readable or doesn't exists, default data will be returned.
+     *
+     * If the file isn't readable or doesn't exist, default data will be returned.
      *
      * @param string $file    File path.
      * @param mixed  $default The default value to return if the file isn't readable.
@@ -61,16 +64,21 @@ class FileUtils
     {
         // Note that gzinflate is faster than gzuncompress.
         // See: http://www.php.net/manual/en/function.gzdeflate.php#96439
-        if (is_readable($file)) {
-            return unserialize(
-                gzinflate(
-                    base64_decode(
-                        substr(file_get_contents($file), strlen(self::$phpPrefix), -strlen(self::$phpSuffix))
-                    )
-                )
-            );
+        if (! is_readable($file)) {
+            return $default;
         }
 
-        return $default;
+        $data = file_get_contents($file);
+        if ($data == '') {
+            return $default;
+        }
+
+        return unserialize(
+            gzinflate(
+                base64_decode(
+                    substr($data, strlen(self::$phpPrefix), -strlen(self::$phpSuffix))
+                )
+            )
+        );
     }
 }