Index: src/system/core/ContentView.inc.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/system/core/ContentView.inc.php	(revision Local version)
+++ src/system/core/ContentView.inc.php	(revision Shelved version)
@@ -433,7 +433,7 @@
 			
 			foreach($gxModulesFiles as $file)
 			{
-				if($t_full_template_path !== $file && stripos($file, $templatePath) !== false)
+				if($t_full_template_path !== $file && stripos($file, $templatePath) !== false || stripos($file,$t_template_file) !== false)
 				{
 					$extenderTemplateFiles[] = $file;
 				}
@@ -449,7 +449,10 @@
 			
 			if(count($extenderTemplateFiles))
 			{
-				array_unshift($extenderTemplateFiles, $t_full_template_path);
+				if(file_exists($t_full_template_path))
+				{
+					array_unshift($extenderTemplateFiles, $t_full_template_path);
+				}
 				$t_html_output = $this->v_coo_smarty->fetch('extends:' . implode('|', $extenderTemplateFiles),
 				                                            $t_cache_id);
 			}