cvs: smarty /libs Smarty.class.php

messju		Mon Mar 15 09:50:42 2004 EDT

  Modified files:              
    /smarty/libs	Smarty.class.php 
  Log:
  simplified Smarty::clear_all_cache();
  
  
http://cvs.php.net/diff.php/smarty/libs/Smarty.class.php?r1=1.479&r2=1.480&ty=u
Index: smarty/libs/Smarty.class.php
diff -u smarty/libs/Smarty.class.php:1.479 smarty/libs/Smarty.class.php:1.480
--- smarty/libs/Smarty.class.php:1.479	Tue Feb 24 17:23:13 2004
+++ smarty/libs/Smarty.class.php	Mon Mar 15 09:50:42 2004
@@ -30,7 +30,7 @@
  * @version 2.6.3-dev
  */
 
-/* $Id: Smarty.class.php,v 1.479 2004/02/24 22:23:13 messju Exp $ */
+/* $Id: Smarty.class.php,v 1.480 2004/03/15 14:50:42 messju Exp $ */
 
 /**
  * DIR_SEP isn't used anymore, but third party apps might
@@ -944,10 +944,10 @@
         if (!isset($compile_id))
             $compile_id = $this->compile_id;
 
-    if (!isset($tpl_file))
-        $compile_id = null;
+        if (!isset($tpl_file))
+            $compile_id = null;
 
-    $_auto_id = $this->_get_auto_id($cache_id, $compile_id);
+        $_auto_id = $this->_get_auto_id($cache_id, $compile_id);
 
         if (!empty($this->cache_handler_func)) {
             return call_user_func_array($this->cache_handler_func,
@@ -972,18 +972,7 @@
      */
     function clear_all_cache($exp_time = null)
     {
-        if (!empty($this->cache_handler_func)) {
-            $dummy = null;
-            call_user_func_array($this->cache_handler_func,
-                           array('clear', &$this, &$dummy, null, null, null, $exp_time));
-        } else {
-            $_params = array('auto_base' => $this->cache_dir,
-                            'auto_source' => null,
-                            'auto_id' => null,
-                            'exp_time' => $exp_time);
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.rm_auto.php');
-            return smarty_core_rm_auto($_params, $this);
-        }
+        return $this->clear_cache(null, null, null, $exp_time);
     }
 
 

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