[BUGFIX] Localconf upgrade wizard fails 82/22282/3
authorWouter Wolters <typo3@wouterwolters.nl>
Sat, 13 Jul 2013 15:43:26 +0000 (17:43 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Mon, 15 Jul 2013 21:36:20 +0000 (23:36 +0200)
Converting localconf.php to LocalConfiguration.php
with the installtool upgrade-wizard fails on
Debian Squeeze installation.

Change-Id: Id06793fc487cd1ad6b1d56ca5ee5a99960b3f4b1
Resolves: #39434
Releases: 6.2, 6.1, 6.0
Reviewed-on: https://review.typo3.org/22282
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
typo3/sysext/install/Classes/Controller/StepController.php

index d37f90b..13318d6 100644 (file)
@@ -269,7 +269,9 @@ class StepController extends AbstractController {
 
                        // Build new TYPO3_CONF_VARS array
                        $TYPO3_CONF_VARS = NULL;
-                       eval(implode(LF, $typo3ConfigurationVariables));
+                       // Issue #39434: Combining next two lines into one triggers a weird issue in some PHP versions
+                       $evalData = implode(LF, $typo3ConfigurationVariables);
+                       eval($evalData);
 
                        // Add db settings to array
                        $TYPO3_CONF_VARS['DB'] = $typo3DatabaseVariables;