Merge pull request #29 from construct-framework/issue-28

Article.php extended template override is always loaded regardless of view

Author: betweenbrain

elements/logic.php

@@ -358,7 +358,10 @@ function getAncestorCategories($id) {
 
 $layoutOverride->includeFile[] = $template . '/layouts/article/' . $overrideTheme . '-article-' . $articleId . '.php';
 $layoutOverride->includeFile[] = $template . '/layouts/article/article-' . $articleId . '.php';
-$layoutOverride->includeFile[] = $template . '/layouts/article/article.php';
+if ($view == 'article')
+{
+	$layoutOverride->includeFile[] = $template . '/layouts/article/article.php';
+}
 $layoutOverride->includeFile[] = $template . '/layouts/item/' . $overrideTheme . '-item-' . $itemId . '.php';
 $layoutOverride->includeFile[] = $template . '/layouts/item/item-' . $itemId . '.php';
 $layoutOverride->includeFile[] = $template . '/layouts/category/' . $overrideTheme . '-category-' . $catId . '.php';