[BUGFIX] Follow-up to #62705: Fix fatal and unit test fail 12/33912/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Sat, 8 Nov 2014 22:16:10 +0000 (23:16 +0100)
committerSteffen Müller <typo3@t3node.com>
Sat, 8 Nov 2014 22:43:11 +0000 (23:43 +0100)
Regressions from merge 627b30f3be8b9fde5ca72ccfa7bfdb2e285a0dd1

* A missing adaption after use flag change leads to fatal
* A differently written LocalConfiguration lets the according
unit test fail. Since stuff like that shouldn't be done in a
cleanup patch, this part is reverted and should get its own patch.

Change-Id: Ie220beeaef983cc90b77c4e946d2b5d444a0cbae
Resolves: #62705
Reviewed-on: http://review.typo3.org/33912
Reviewed-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
Tested-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
Reviewed-by: Steffen Müller <typo3@t3node.com>
Tested-by: Steffen Müller <typo3@t3node.com>
typo3/sysext/core/Classes/Configuration/ConfigurationManager.php

index 480e52b..8c27e0d 100644 (file)
@@ -16,6 +16,7 @@ namespace TYPO3\CMS\Core\Configuration;
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
+use TYPO3\CMS\Core\Utility\OpcodeCacheUtility;
 
 /**
  * Handle loading and writing of global and local (instance specific)
@@ -303,11 +304,12 @@ class ConfigurationManager {
                                        ArrayUtility::arrayExport(
                                                ArrayUtility::renumberKeysToAvoidLeapsIfKeysAreAllNumeric($configuration)
                                        ) .
-                               ';' . LF,
+                               ';' . LF .
+                       '?>',
                        TRUE
                );
 
-               Utility\OpcodeCacheUtility::clearAllActive($localConfigurationFile);
+               OpcodeCacheUtility::clearAllActive($localConfigurationFile);
 
                return $result;
        }