[BUGFIX] Remove relation to old em in impexp 00/27100/2
authorMarc Bastian Heinrichs <typo3@mbh-software.de>
Tue, 28 Jan 2014 17:07:47 +0000 (18:07 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Fri, 31 Jan 2014 22:48:26 +0000 (23:48 +0100)
If a import file has extension dependencies the user was
redirected to the old em with CMD requestInstallExtensions.
Since the new extensionmanager hasn't this functionality,
remove this magic and show the message only.

Resolves: #43709
Releases: 6.2, 6.1, 6.0
Change-Id: I161d4a24135f0d011177f2d4006e4713c71a8fcb
Reviewed-on: https://review.typo3.org/27100
Reviewed-by: Wouter Wolters
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/impexp/Classes/Controller/ImportExportController.php

index 41cfa27..962012c 100644 (file)
@@ -884,19 +884,12 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                                                }
                                        }
                                        if (count($extKeysToInstall)) {
-                                               $passParams = GeneralUtility::_POST('tx_impexp');
-                                               unset($passParams['import_mode']);
-                                               unset($passParams['import_file']);
-                                               $thisScriptUrl = GeneralUtility::getIndpEnv('REQUEST_URI') . '?M=xMOD_tximpexp&id=' . $this->id . GeneralUtility::implodeArrayForUrl('tx_impexp', $passParams);
-                                               $emURL = $this->doc->backPath . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('em') . 'classes/index.php?CMD[requestInstallExtensions]=' . implode(',', $extKeysToInstall) . '&returnUrl=' . rawurlencode($thisScriptUrl);
-                                               $extensionInstallationMessage = 'Before you can install this T3D file you need to install the extensions "' . implode('", "', $extKeysToInstall) . '". Clicking Import will first take you to the Extension Manager so these dependencies can be resolved.';
+                                               $extensionInstallationMessage = 'Before you can install this T3D file you need to install the extensions "' . implode('", "', $extKeysToInstall) . '".';
                                        }
                                        if ($inData['import_file']) {
                                                if (!count($extKeysToInstall)) {
                                                        $import->importData($this->id);
                                                        BackendUtility::setUpdateSignal('updatePageTree');
-                                               } else {
-                                                       \TYPO3\CMS\Core\Utility\HttpUtility::redirect($emURL);
                                                }
                                        }
                                        $import->display_import_pid_record = $this->pageinfo;