[BUGFIX] Ensure t3d compatibility for supported TYPO3 version 91/47091/2
authorNicole Cordes <typo3@cordes.co>
Fri, 4 Mar 2016 09:33:48 +0000 (10:33 +0100)
committerBenni Mack <benni@typo3.org>
Sat, 5 Mar 2016 14:04:33 +0000 (15:04 +0100)
This patch fixes an issue with unclean t3d export due to string to array
conversion. This is important to be able to import a t3d files which was
exported with 7.6 and above even in 6.2. This is needed as we do not
have any chance to see which TYPO3 version was used for the export.

Resolves: #74127
Releases: master, 7.6, 6.2
Change-Id: I6ba7b825241c2ca439c485aaf597b019b7ac8997
Reviewed-on: https://review.typo3.org/47091
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
typo3/sysext/impexp/Classes/Controller/ImportExportController.php
typo3/sysext/impexp/Classes/ImportExport.php

index 35f32d6..dd06f3b 100644 (file)
@@ -1013,7 +1013,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                                        $extKeysToInstall = array();
                                        if (is_array($import->dat['header']['extensionDependencies'])) {
                                                foreach ($import->dat['header']['extensionDependencies'] as $extKey) {
-                                                       if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extKey)) {
+                                                       if (!empty($extKey) && !\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extKey)) {
                                                                $extKeysToInstall[] = $extKey;
                                                        }
                                                }
index 4e4ea4f..c5385ac 100644 (file)
@@ -3271,7 +3271,7 @@ class ImportExport {
                // Check extension dependencies:
                if (is_array($this->dat['header']['extensionDependencies'])) {
                        foreach ($this->dat['header']['extensionDependencies'] as $extKey) {
-                               if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extKey)) {
+                               if (!empty($extKey) && !\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extKey)) {
                                        $this->error('DEPENDENCY: The extension with key "' . $extKey . '" must be installed!');
                                }
                        }