cvs: smarty /libs Smarty.class.php

messju		Fri Aug  8 16:41:37 2003 EDT

  Modified files:              
    /smarty/libs	Smarty.class.php 
  Log:
  fix: proper nesting of $smarty->_cache_including flag in cascaded
  cached/not-cached/fetched/inserted/foo-templates
  
  
  
Index: smarty/libs/Smarty.class.php
diff -u smarty/libs/Smarty.class.php:1.433 smarty/libs/Smarty.class.php:1.434
--- smarty/libs/Smarty.class.php:1.433	Fri Aug  8 16:25:27 2003
+++ smarty/libs/Smarty.class.php	Fri Aug  8 16:41:37 2003
@@ -43,7 +43,7 @@
  * @version 2.5.0-cvs
  */
 
-/* $Id: Smarty.class.php,v 1.433 2003/08/08 20:25:27 messju Exp $ */
+/* $Id: Smarty.class.php,v 1.434 2003/08/08 20:41:37 messju Exp $ */
 
 /**
  * DIR_SEP isn't used anymore, but third party apps might
@@ -1310,6 +1310,8 @@
 
         // if we just need to display the results, don't perform output
         // buffering - for speed
+        $_cache_including = $this->_cache_including;
+        $this->_cache_including = false;
         if ($display && !$this->caching && count($this->_plugins['outputfilter']) == 0) {
             if ($this->_is_compiled($resource_name, $_smarty_compile_path)
 					|| $this->_compile_resource($resource_name, $_smarty_compile_path))
@@ -1350,6 +1352,7 @@
             // restore initial cache_info
             $this->_cache_info = array_pop($_cache_info);
         }
+        $this->_cache_including = $_cache_including;
 
         if ($display) {
             if (isset($_smarty_results)) { echo $_smarty_results; }



-- 
Smarty CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php