smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 10:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

backed out _smarty_cached_paths-file-handling

Browse Source
This commit is contained in:
messju
2003-09-15 14:30:57 +00:00
parent 7c38847c69
commit 6988b4747e
3 changed files with 2 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
libs/Smarty.class.php
View File

@@ -587,20 +587,6 @@ class Smarty
*/
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 @@ class Smarty
{
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)) {
@@ -1442,23 +1413,9 @@ class Smarty
*/
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,12 +1529,8 @@ class Smarty
$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;

2
libs/Smarty_Compiler.class.php
View File

@@ -86,8 +86,6 @@ class Smarty_Compiler extends Smarty {
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";

29
libs/core/core.write_cache_paths_file.php
View File

@@ -1,29 +0,0 @@
<?php
/**
* Smarty plugin
* @package Smarty
* @subpackage plugins
*/
/**
* write out the cached paths file
*
* @param integer $exp_time
* @return boolean
*/
function smarty_core_write_cache_paths_file($params, &$smarty)
{
if (!isset($smarty->_cache_paths_file)) {
return false;
}
$_compiled_content = function_exists('var_export') ? var_export($smarty->_cache_paths, true) : "unserialize('" . serialize($smarty->_cache_paths) . "')";
$_compiled_content = '<?php $this->_cache_paths = ' . $_compiled_content . '; ?>';
$_params = array('compile_path' => $smarty->_cache_paths_file, 'compiled_content' => $_compiled_content, 'resource_timestamp' => time());
require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.write_compiled_resource.php');
return smarty_core_write_compiled_resource($_params, $smarty);
}
/* vim: set expandtab: */
?>