cvs: smarty /libs Smarty.class.php /libs/core core.read_cache_file.php

messju		Thu Aug 14 12:44:03 2003 EDT

  Modified files:              
    /smarty/libs	Smarty.class.php 
    /smarty/libs/core	core.read_cache_file.php 
  Log:
  fixed timestamp-check of config-files in smarty_core_read_cache_file()
  
  
Index: smarty/libs/Smarty.class.php
diff -u smarty/libs/Smarty.class.php:1.438 smarty/libs/Smarty.class.php:1.439
--- smarty/libs/Smarty.class.php:1.438	Thu Aug 14 07:11:46 2003
+++ smarty/libs/Smarty.class.php	Thu Aug 14 12:44:02 2003
@@ -43,7 +43,7 @@
  * @version 2.6.0-RC1-cvs
  */
 
-/* $Id: Smarty.class.php,v 1.438 2003/08/14 11:11:46 messju Exp $ */
+/* $Id: Smarty.class.php,v 1.439 2003/08/14 16:44:02 messju Exp $ */
 
 /**
  * DIR_SEP isn't used anymore, but third party apps might
@@ -1630,6 +1630,9 @@
 
         $_return = false;
         $_params = array('resource_name' => $params['resource_name']) ;
+        if (isset($params['resource_base_path']))
+            $_params['resource_base_path'] = $params['resource_base_path'];
+
         if ($this->_parse_resource_name($_params)) {
             $_resource_type = $_params['resource_type'];
             $_resource_name = $_params['resource_name'];
Index: smarty/libs/core/core.read_cache_file.php
diff -u smarty/libs/core/core.read_cache_file.php:1.9 smarty/libs/core/core.read_cache_file.php:1.10
--- smarty/libs/core/core.read_cache_file.php:1.9	Wed Jul 23 12:14:47 2003
+++ smarty/libs/core/core.read_cache_file.php	Thu Aug 14 12:44:03 2003
@@ -78,8 +78,9 @@
         }
 
         if (isset($smarty->_cache_info['config'])) {
+            $_params = array('resource_base_path' => $smarty->config_dir); 
             foreach (array_keys($smarty->_cache_info['config']) as $_config_dep) {
-				$_params = array('resource_name' => $_config_dep);
+                $_params['resource_name'] = $_config_dep;
 				$smarty->_fetch_resource_info($_params);
             	if ($smarty->_cache_info['timestamp'] < $_params['resource_timestamp']) {
                 	// config file has changed, regenerate cache



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