- bugfix failure when the default resource type was set to 'extendsall'

#123
smarty-php · Dec 20, 2015 · e655856 · e655856
1 parent dc9872e
commit e655856
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/change_log.txt b/change_log.txt
@@ -1,4 +1,7 @@
  ===== 3.1.29-dev ===== (xx.xx.2015)
+ 20.12.2015
+  - bugfix failure when the default resource type was set to 'extendsall' https://github.com/smarty-php/smarty/issues/123
+
  19.12.2015
   - bugfix using $smarty.capture.foo in expressions could fail https://github.com/smarty-php/smarty/pull/138
   - bugfix broken PHP 5.2 compatibility https://github.com/smarty-php/smarty/issues/139

diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
@@ -118,7 +118,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.29-dev/13';
+    const SMARTY_VERSION = '3.1.29-dev/14';
 
     /**
      * define variable scopes

diff --git a/libs/sysplugins/smarty_internal_runtime_validatecompiled.php b/libs/sysplugins/smarty_internal_runtime_validatecompiled.php
@@ -43,7 +43,7 @@ public function decodeProperties(Smarty_Internal_Template $tpl, $properties, $ca
                 } elseif ($_file_to_check[2] == 'string') {
                     continue;
                 } else {
-                    $source = Smarty_Template_Source::load(null, $tpl->smarty, $_file_to_check[0]);
+                    $source = Smarty_Template_Source::load($tpl, $tpl->smarty, $_file_to_check[0]);
                     $mtime = $source->getTimeStamp();
                 }
                 if (!$mtime || $mtime > $_file_to_check[1]) {