- bugfix {include} with variable file name must not create by default…

… individual cache file (since 3.1.22) smarty-php#43
bourrelidylan · May 27, 2015 · 63b1d34 · 63b1d34
1 parent 0434f34
commit 63b1d34
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/change_log.txt b/change_log.txt
@@ -1,4 +1,7 @@
  ===== 3.1.25-dev===== (xx.xx.2015)
+ 27.05.2015
+  - bugfix {include} with variable file name must not create by default individual cache file (since 3.1.22) https://github.com/smarty-php/smarty/issues/43
+
  24.05.2015
   - bugfix if condition string 'neq' broken due to a typo https://github.com/smarty-php/smarty/issues/42
 

diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
@@ -111,7 +111,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.25-dev/1';
+    const SMARTY_VERSION = '3.1.25-dev/2';
 
     /**
      * define variable scopes

diff --git a/libs/sysplugins/smarty_internal_compile_include.php b/libs/sysplugins/smarty_internal_compile_include.php
@@ -101,31 +101,29 @@ public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler,
         // flag if included template code should be merged into caller
         $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) || $_attr['inline'] === true) && !$compiler->template->source->recompiled;
 
-        // variable template name ?
-        if ($compiler->has_variable_string || !((substr_count($include_file, '"') == 2 || substr_count($include_file, "'") == 2))
-            || substr_count($include_file, '(') != 0 || substr_count($include_file, '$_smarty_tpl->') != 0
-        ) {
-            $merge_compiled_includes = false;
-            if ($compiler->template->caching) {
-                // must use individual cache file
-                $_attr['caching'] = 1;
-            }
-            if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes && $_attr['inline'] !== true) {
-                $compiler->trigger_template_error(' variable template file names not allow within {block} tags');
-            }
-        }
-        // variable compile_id?
-        if (isset($_attr['compile_id'])) {
-            if (!((substr_count($_attr['compile_id'], '"') == 2 || substr_count($_attr['compile_id'], "'") == 2 || is_numeric($_attr['compile_id'])))
-                || substr_count($_attr['compile_id'], '(') != 0 || substr_count($_attr['compile_id'], '$_smarty_tpl->') != 0
-            ) {
+        if ($merge_compiled_includes && $_attr['inline'] !== true) {
+            // variable template name ?
+            if ($compiler->has_variable_string || !((substr_count($include_file, '"') == 2 || substr_count($include_file, "'") == 2)) || substr_count($include_file, '(') != 0 || substr_count($include_file, '$_smarty_tpl->') != 0) {
                 $merge_compiled_includes = false;
                 if ($compiler->template->caching) {
                     // must use individual cache file
-                    $_attr['caching'] = 1;
+                    //$_attr['caching'] = 1;
                 }
                 if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes && $_attr['inline'] !== true) {
-                    $compiler->trigger_template_error(' variable compile_id not allow within {block} tags');
+                    $compiler->trigger_template_error(' variable template file names not allow within {block} tags');
+                }
+            }
+            // variable compile_id?
+            if (isset($_attr['compile_id'])) {
+                if (!((substr_count($_attr['compile_id'], '"') == 2 || substr_count($_attr['compile_id'], "'") == 2 || is_numeric($_attr['compile_id']))) || substr_count($_attr['compile_id'], '(') != 0 || substr_count($_attr['compile_id'], '$_smarty_tpl->') != 0) {
+                    $merge_compiled_includes = false;
+                    if ($compiler->template->caching) {
+                        // must use individual cache file
+                        //$_attr['caching'] = 1;
+                    }
+                    if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes && $_attr['inline'] !== true) {
+                        $compiler->trigger_template_error(' variable compile_id not allow within {block} tags');
+                    }
                 }
             }
         }