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

supress fopen errors, return false if cache file won't load

Browse Source
This commit is contained in:
mohrt
2001-11-02 15:07:41 +00:00
parent 41448a1555
commit 6621495b0a
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -1,3 +1,5 @@
- added index key example to QUICKSTART guide (Monte)
Version 1.4.6 Version 1.4.6
------------- -------------
- fixed bug with {assign ...} when passing an empty value. (Monte) - fixed bug with {assign ...} when passing an empty value. (Monte)

8
Smarty.class.php
View File

@@ -1070,7 +1070,7 @@ function _run_mod_handler()
function _read_file($filename) function _read_file($filename)
{ {
if (!($fd = fopen($filename, 'r'))) { if (!($fd = @fopen($filename, 'r'))) {
$this->_trigger_error_msg("problem reading '$filename.'"); $this->_trigger_error_msg("problem reading '$filename.'");
return false; return false;
} }
@@ -1089,7 +1089,7 @@ function _run_mod_handler()
if ($create_dirs) if ($create_dirs)
$this->_create_dir_structure(dirname($filename)); $this->_create_dir_structure(dirname($filename));
if (!($fd = fopen($filename, 'w'))) { if (!($fd = @fopen($filename, 'w'))) {
$this->_trigger_error_msg("problem writing '$filename.'"); $this->_trigger_error_msg("problem writing '$filename.'");
return false; return false;
} }
@@ -1227,6 +1227,10 @@ function _run_mod_handler()
{ {
$results = $this->_read_file($cache_file); $results = $this->_read_file($cache_file);
if(empty($results)) {
return false;
}
// get the files involved with this cache from the first line // get the files involved with this cache from the first line
$contents = explode("\n", $results, 2); $contents = explode("\n", $results, 2);

2
demo/index.php
View File

@@ -1,7 +1,5 @@
<?php <?php
require("Smarty.class.php");
$smarty = new Smarty; $smarty = new Smarty;
$smarty->compile_check = true; $smarty->compile_check = true;

2
index.php
View File

@@ -1,7 +1,5 @@
<?php <?php
require("Smarty.class.php");
$smarty = new Smarty; $smarty = new Smarty;
$smarty->compile_check = true; $smarty->compile_check = true;

8
libs/Smarty.class.php
View File

@@ -1070,7 +1070,7 @@ function _run_mod_handler()
function _read_file($filename) function _read_file($filename)
{ {
if (!($fd = fopen($filename, 'r'))) { if (!($fd = @fopen($filename, 'r'))) {
$this->_trigger_error_msg("problem reading '$filename.'"); $this->_trigger_error_msg("problem reading '$filename.'");
return false; return false;
} }
@@ -1089,7 +1089,7 @@ function _run_mod_handler()
if ($create_dirs) if ($create_dirs)
$this->_create_dir_structure(dirname($filename)); $this->_create_dir_structure(dirname($filename));
if (!($fd = fopen($filename, 'w'))) { if (!($fd = @fopen($filename, 'w'))) {
$this->_trigger_error_msg("problem writing '$filename.'"); $this->_trigger_error_msg("problem writing '$filename.'");
return false; return false;
} }
@@ -1227,6 +1227,10 @@ function _run_mod_handler()
{ {
$results = $this->_read_file($cache_file); $results = $this->_read_file($cache_file);
if(empty($results)) {
return false;
}
// get the files involved with this cache from the first line // get the files involved with this cache from the first line
$contents = explode("\n", $results, 2); $contents = explode("\n", $results, 2);