[BUGFIX] Allow importing of non-compressed t3d files again 28/46528/2
authorMarkus Klein <markus.klein@typo3.org>
Fri, 5 Feb 2016 18:38:46 +0000 (19:38 +0100)
committerBenni Mack <benni@typo3.org>
Mon, 8 Feb 2016 14:12:38 +0000 (15:12 +0100)
Resolves: #73157
Releases: master, 7.6
Change-Id: I6b08290fd4961116f7dbcc87d11b2d35b61411fb
Reviewed-on: https://review.typo3.org/46528
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
typo3/sysext/impexp/Classes/Import.php

index d1f0855..897ab75 100644 (file)
@@ -2060,11 +2060,12 @@ class Import extends ImportExport
             if ($initStrDat[1]) {
                 if ($this->compress) {
                     $datString = gzuncompress($datString);
             if ($initStrDat[1]) {
                 if ($this->compress) {
                     $datString = gzuncompress($datString);
-                    return $unserialize ? unserialize($datString) : $datString;
                 } else {
                     $this->error('Content read error: This file requires decompression, but this server does not offer gzcompress()/gzuncompress() functions.');
                 } else {
                     $this->error('Content read error: This file requires decompression, but this server does not offer gzcompress()/gzuncompress() functions.');
+                    return null;
                 }
             }
                 }
             }
+            return $unserialize ? unserialize($datString) : $datString;
         } else {
             $this->error('MD5 check failed (' . $name . ')');
         }
         } else {
             $this->error('MD5 check failed (' . $name . ')');
         }