cvs: smarty /libs Smarty.class.php Smarty_Compiler.class.php /libs/core core.write_cache_paths_file.php

messju		Mon Sep 15 10:30:57 2003 EDT

  Removed files:               
    /smarty/libs/core	core.write_cache_paths_file.php 

  Modified files:              
    /smarty/libs	Smarty.class.php Smarty_Compiler.class.php 
  Log:
  backed out _smarty_cached_paths-file-handling
  
  
Index: smarty/libs/Smarty.class.php
diff -u smarty/libs/Smarty.class.php:1.448 smarty/libs/Smarty.class.php:1.449
--- smarty/libs/Smarty.class.php:1.448	Mon Sep 15 08:55:06 2003
+++ smarty/libs/Smarty.class.php	Mon Sep 15 10:30:56 2003
@@ -43,7 +43,7 @@
  * @version 2.6.0-RC1-cvs
  */
 
-/* $Id: Smarty.class.php,v 1.448 2003/09/15 12:55:06 messju Exp $ */
+/* $Id: Smarty.class.php,v 1.449 2003/09/15 14:30:56 messju Exp $ */
 
 /**
  * DIR_SEP isn't used anymore, but third party apps might
@@ -587,20 +587,6 @@
      */
     var $_cache_including = false;
 
-    /**
-     * cached file paths
-     *
-     * @var array
-     */
-    var $_cache_paths = null;
-
-    /**
-     * cached file pathname (set in constructor)
-     *
-     * @var array
-     */
-    var $_cache_paths_file = null;
-		
     /**#@-*/
     /**
      * The class constructor.
@@ -1182,21 +1168,6 @@
     {
         static $_cache_info = array();
 
-		$_compile_dir_sep =  $this->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
-		
-		$this->_cache_paths_file =
-				$this->compile_dir
-				. DIRECTORY_SEPARATOR
-				. '_smarty_cached_paths'
-				. $_compile_dir_sep
-				. urlencode($resource_name)
-				. '.php';
-
-		if(!$this->force_compile
-			&& file_exists($this->_cache_paths_file)) {
-			include($this->_cache_paths_file);
-		}		
-				
         $_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(error_reporting() & ~E_NOTICE);
 
         if($this->security && !in_array($this->template_dir, $this->secure_dir)) {
@@ -1439,26 +1410,12 @@
      * @param string $type
      * @param string $name
      * @return string|false
-     */    
+     */
     function _get_plugin_filepath($type, $name)
     {
-		$_cache_paths_key = $type . '/' . $name;
-		if (isset($this->_cache_paths['plugins'][$_cache_paths_key])) {
-			return $this->_cache_paths['plugins'][$_cache_paths_key];
-		}
-		
 		$_params = array('type' => $type, 'name' => $name);
 		require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.assemble_plugin_filepath.php');
-		$_return = smarty_core_assemble_plugin_filepath($_params, $this);
-						
-		if ($_return !== false) {
-			$this->_cache_paths['plugins'][$_cache_paths_key] = $_return;
-			require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.write_cache_paths_file.php');
-			smarty_core_write_cache_paths_file(null, $this);
-			return $_return;
-		}
-		
-        return false;
+		return smarty_core_assemble_plugin_filepath($_params, $this);
     }	
 	
    /**
@@ -1572,11 +1529,7 @@
         $smarty_compiler->default_modifiers = $this->default_modifiers;
         $smarty_compiler->compile_id        = $this->_compile_id;
         $smarty_compiler->_config			= $this->_config;
-
         $smarty_compiler->request_use_auto_globals  = $this->request_use_auto_globals;
-
-        $smarty_compiler->_cache_paths   	= $this->_cache_paths;
-        $smarty_compiler->_cache_paths_file	= $this->_cache_paths_file;
 
         $smarty_compiler->_cache_serial = null;
         $smarty_compiler->_cache_include = $cache_include_path;
Index: smarty/libs/Smarty_Compiler.class.php
diff -u smarty/libs/Smarty_Compiler.class.php:1.283 smarty/libs/Smarty_Compiler.class.php:1.284
--- smarty/libs/Smarty_Compiler.class.php:1.283	Fri Sep 12 10:39:45 2003
+++ smarty/libs/Smarty_Compiler.class.php	Mon Sep 15 10:30:56 2003
@@ -39,7 +39,7 @@
  * @package Smarty
  */
 
-/* $Id: Smarty_Compiler.class.php,v 1.283 2003/09/12 14:39:45 messju Exp $ */
+/* $Id: Smarty_Compiler.class.php,v 1.284 2003/09/15 14:30:56 messju Exp $ */
 
 /**
  * Template compiling class
@@ -86,8 +86,6 @@
     var $_nocache_count         =   0;
     var $_cache_serial          =   null;
     var $_cache_include         =   null;
-    var $_cache_paths_file      =   null;
-    var $_cache_paths           =   null;
 
     var $_strip_depth           =   0;
     var $_additional_newline           =   "\n";

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