Merge pull request FluidTYPO3#1094 from NamelessCoder/configurationma…

…nagerfallback [BUGFIX] Fallback to page-unaware ConfigurationManager
dextar47 · Mar 7, 2016 · aff30de · aff30de
2 parents 718365c + fe31dda
commit aff30de
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/Classes/Service/FluxService.php b/Classes/Service/FluxService.php
@@ -8,6 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Flux\Configuration\BackendConfigurationManager;
 use FluidTYPO3\Flux\FluxPackage;
 use FluidTYPO3\Flux\Form;
 use FluidTYPO3\Flux\Form\Container\Grid;
@@ -352,12 +353,18 @@ public function getTypoScriptByPath($path) {
 	 * @return array
 	 */
 	public function getAllTypoScript() {
-		$pageId = $this->configurationManager->getCurrentPageId();
-		if (FALSE === isset(self::$typoScript[$pageId])) {
-			self::$typoScript[$pageId] = (array) $this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
-			self::$typoScript[$pageId] = GeneralUtility::removeDotsFromTS(self::$typoScript[$pageId]);
+		if (!$this->configurationManager instanceof BackendConfigurationManager) {
+			$typoScript = (array) $this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
+			$typoScript = GeneralUtility::removeDotsFromTS($typoScript);
+			return $typoScript;
+		} else {
+			$pageId = $this->configurationManager->getCurrentPageId();
+			if (FALSE === isset(self::$typoScript[$pageId])) {
+				self::$typoScript[$pageId] = (array) $this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
+				self::$typoScript[$pageId] = GeneralUtility::removeDotsFromTS(self::$typoScript[$pageId]);
+			}
+			return (array) self::$typoScript[$pageId];
 		}
-		return (array) self::$typoScript[$pageId];
 	}
 
 	/**