[BUGFIX] Avoid extension path resolving if extension not loaded

htuscher · Sep 11, 2015 · cc1cc29 · cc1cc29
1 parent 9fa799f
commit cc1cc29
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/Classes/View/TemplatePaths.php b/Classes/View/TemplatePaths.php
@@ -69,13 +69,16 @@ class TemplatePaths {
 	protected $partialRootPaths = array();
 
 	/**
-	 * @param string|NULL $packageNameOrTypoScriptArray
+	 * @param string|NULL $packageOrPaths
 	 */
-	public function __construct($packageNameOrTypoScriptArray = NULL) {
-		if (TRUE === is_array($packageNameOrTypoScriptArray)) {
-			$this->fillFromTypoScriptArray($packageNameOrTypoScriptArray);
-		} elseif (FALSE === empty($packageNameOrTypoScriptArray)) {
-			$this->fillDefaultsByPackageName($packageNameOrTypoScriptArray);
+	public function __construct($packageOrPaths = NULL) {
+		if (TRUE === is_array($packageOrPaths)) {
+			$this->fillFromTypoScriptArray($packageOrPaths);
+		} elseif (
+			FALSE === empty($packageOrPaths)
+			&& ExtensionManagementUtility::isLoaded(ExtensionNamingUtility::getExtensionKey($packageOrPaths))
+		) {
+			$this->fillDefaultsByPackageName($packageOrPaths);
 		}
 	}