From 2eb9352f7820b2ca068c8f62b6a432dd1a88f000 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 17 Mar 2014 17:12:02 +0000 Subject: [PATCH] fixed error "template NOT found!", if template-name contains cache-buster --- etemplate/inc/class.etemplate_widget_template.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etemplate/inc/class.etemplate_widget_template.inc.php b/etemplate/inc/class.etemplate_widget_template.inc.php index 93b4878398..8b0e897b60 100644 --- a/etemplate/inc/class.etemplate_widget_template.inc.php +++ b/etemplate/inc/class.etemplate_widget_template.inc.php @@ -47,7 +47,8 @@ class etemplate_widget_template extends etemplate_widget */ public static function instance($name, $template_set=null, $version='', $load_via='') { - $start = microtime(true); + //$start = microtime(true); + list($name) = explode('?', $name); // remove optional cache-buster if (isset(self::$cache[$name]) || !($path = self::relPath($name, $template_set, $version))) { if ((!$path || self::read($load_via, $template_set)) && isset(self::$cache[$name])) @@ -60,7 +61,7 @@ class etemplate_widget_template extends etemplate_widget { foreach(self::$cache as $c_name => $c_template) { - list($c_app, $c_main, $c_sub) = explode('.',$c_name, 3); + list(,, $c_sub) = explode('.',$c_name, 3); if($name == $c_sub) { //error_log(__METHOD__ . "('$name' loaded from cache ($c_name)"); @@ -124,6 +125,7 @@ class etemplate_widget_template extends etemplate_widget */ public static function relPath($name, $template_set=null, $version='') { + unset($version); // not used currently list($app, $rest) = explode('.', $name, 2); if (empty($template_set))