From 0e927f0045e67d4a9b31218fe80fd9dcc1971fc5 Mon Sep 17 00:00:00 2001
From: andrey <andrey@localhost>
Date: Mon, 10 Dec 2001 15:10:00 +0000
Subject: [PATCH] Removed error message from the _read_file() method.

---
 NEWS                  | 9 ++++++---
 Smarty.class.php      | 1 -
 libs/Smarty.class.php | 1 -
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 4444b648..d0000c2c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
+    - removed error message from the generic _read_file() method, the caller
+      should take care of that. (Andrei)
+    - fixed a bug with incorrectly combined cache and compile id. (Andrei)
+
 Version 1.5.0
 -------------
-
     - added include_php built-in function, documented. (Monte)
     - added trusted_dir functionality, documented. (Monte)
     - consolidated secure_dir tests to one function. (Monte)
@@ -12,8 +15,8 @@ Version 1.5.0
     - added $smarty.section.* syntax for accessing section properties,
       documented. (Andrei)
     - added custom cache handling function ability, documented. (Monte)
-	- added assign attribute to include, include_php, insert, fetch, math, and
-	  counter functions, documented. (Monte)
+    - added assign attribute to include, include_php, insert, fetch, math, and
+      counter functions, documented. (Monte)
     - fixed bug with fetch testing for local file when http address. (Monte)
     - fixed bug with counter and skipval setting. (Monte)
     - made {config_load ...} merge globals from each config file only once per
diff --git a/Smarty.class.php b/Smarty.class.php
index acb7a3b4..c4a1eded 100644
--- a/Smarty.class.php
+++ b/Smarty.class.php
@@ -1185,7 +1185,6 @@ function _run_insert_handler($args)
     function _read_file($filename, $start=null, $lines=null)
     {
         if (!($fd = @fopen($filename, 'r'))) {
-            $this->_trigger_error_msg("problem reading '$filename.'");
             return false;
         }
         flock($fd, LOCK_SH);
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index acb7a3b4..c4a1eded 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -1185,7 +1185,6 @@ function _run_insert_handler($args)
     function _read_file($filename, $start=null, $lines=null)
     {
         if (!($fd = @fopen($filename, 'r'))) {
-            $this->_trigger_error_msg("problem reading '$filename.'");
             return false;
         }
         flock($fd, LOCK_SH);