refs #71 Add .tpl override

nabeelio · nabeelio · commit 520b976706d4 · 2012-07-16T11:48:24.000-04:00
diff --git a/core/classes/TemplateSet.class.php b/core/classes/TemplateSet.class.php
@@ -209,9 +209,13 @@ public function get($tpl_name, $ret = false, $checkskin = true, $force_base = fa
      *
      */
     public function getTemplate($tpl_name, $ret = false, $checkskin = true, $force_base = false) {
+
+		if(substr_count($tpl_name, '.tpl') > 0) {
+			$tpl_name = str_replace('.tpl', '.' . $this->tpl_ext, $tpl_name);
+		}
         
-        if (strstr($tpl_name, $this->tpl_ext) === false) {
-            $tpl_name .= '.'.$this->tpl_ext;
+        if (substr_count($tpl_name, '.' . $this->tpl_ext) === 0) {
+            $tpl_name .= '.' . $this->tpl_ext;
         }
 
         /* See if the file has been over-rided in the skin directory

Original file line number	Diff line number	Diff line change
`@@ -209,9 +209,13 @@ public function get($tpl_name, $ret = false, $checkskin = true, $force_base = fa`
`209`	`209`	`*`
`210`	`210`	`*/`
`211`	`211`	`public function getTemplate($tpl_name, $ret = false, $checkskin = true, $force_base = false) {`
	`212`	`+`
	`213`	`+ if(substr_count($tpl_name, '.tpl') > 0) {`
	`214`	`+ $tpl_name = str_replace('.tpl', '.' . $this->tpl_ext, $tpl_name);`
	`215`	`+ }`
`212`	`216`
`213`		`- if (strstr($tpl_name, $this->tpl_ext) === false) {`
`214`		`- $tpl_name .= '.'.$this->tpl_ext;`
	`217`	`+ if (substr_count($tpl_name, '.' . $this->tpl_ext) === 0) {`
	`218`	`+ $tpl_name .= '.' . $this->tpl_ext;`
`215`	`219`	`}`
`216`	`220`
`217`	`221`	`/* See if the file has been over-rided in the skin directory`