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

omit is-cache_dir-writable-check if a cache_handler_function is in use

Browse Source
This commit is contained in:
messju
2003-06-19 16:32:28 +00:00
parent 73fb79675e
commit 65dfa12d2b
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libs/core/core.write_cache_file.php
View File

@@ -15,22 +15,12 @@
* @param string $results * @param string $results
* @return true|null * @return true|null
*/ */
// $tpl_file, $cache_id, $compile_id, $results // $tpl_file, $cache_id, $compile_id, $results
function smarty_core_write_cache_file($params, &$this) function smarty_core_write_cache_file($params, &$this)
{ {
if(!@is_writable($this->cache_dir)) {
// cache_dir not writable, see if it exists
if(!@is_dir($this->cache_dir)) {
$this->trigger_error('the $cache_dir \'' . $this->cache_dir . '\' does not exist, or is not a directory.', E_USER_ERROR);
return false;
}
$this->trigger_error('unable to write to $cache_dir \'' . realpath($this->cache_dir) . '\'. Be sure $cache_dir is writable by the web server user.', E_USER_ERROR);
return false;
}
// put timestamp in cache header // put timestamp in cache header
$this->_cache_info['timestamp'] = time(); $this->_cache_info['timestamp'] = time();
if ($this->cache_lifetime > -1){ if ($this->cache_lifetime > -1){
@@ -55,13 +45,24 @@ function smarty_core_write_cache_file($params, &$this)
if (!empty($this->cache_handler_func)) { if (!empty($this->cache_handler_func)) {
// use cache_handler function // use cache_handler function
call_user_func_array($this->cache_handler_func, call_user_func_array($this->cache_handler_func,
array('write', &$this, &$params['results'], $params['tpl_file'], $params['cache_id'], $params['compile_id'])); array('write', &$this, &$params['results'], $params['tpl_file'], $params['cache_id'], $params['compile_id']));
} else { } else {
// use local cache file // use local cache file
if(!@is_writable($this->cache_dir)) {
// cache_dir not writable, see if it exists
if(!@is_dir($this->cache_dir)) {
$this->trigger_error('the $cache_dir \'' . $this->cache_dir . '\' does not exist, or is not a directory.', E_USER_ERROR);
return false;
}
$this->trigger_error('unable to write to $cache_dir \'' . realpath($this->cache_dir) . '\'. Be sure $cache_dir is writable by the web server user.', E_USER_ERROR);
return false;
}
$_auto_id = $this->_get_auto_id($params['cache_id'], $params['compile_id']); $_auto_id = $this->_get_auto_id($params['cache_id'], $params['compile_id']);
$_cache_file = $this->_get_auto_filename($this->cache_dir, $params['tpl_file'], $_auto_id); $_cache_file = $this->_get_auto_filename($this->cache_dir, $params['tpl_file'], $_auto_id);
$_params = array('filename' => $_cache_file, 'contents' => $params['results'], 'create_dirs' => true); $_params = array('filename' => $_cache_file, 'contents' => $params['results'], 'create_dirs' => true);
require_once(SMARTY_DIR . 'core/core.write_file.php'); require_once(SMARTY_DIR . 'core/core.write_file.php');
smarty_core_write_file($_params, $this); smarty_core_write_file($_params, $this);
return true; return true;
} }