From 019a8f3c0e0cc91a8ad8bd8d687c7bdb2d634750 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sat, 22 Oct 2005 23:27:51 +0000 Subject: [PATCH] Merging r211 down stream --- dev/changes.txt | 3 ++- template.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/changes.txt b/dev/changes.txt index 02e52e7..a28efa2 100644 --- a/dev/changes.txt +++ b/dev/changes.txt @@ -29,4 +29,5 @@ CHANGELOG - Added localization framework [localize.php] - Template phrase parser no longer uses {lang.*} method, but insted {@""} for template text - Template phrase parser uses ISSO's localize instead of a per-application system -- ISSO should now work flawlessly on all types of servers (Windows and *NIX) \ No newline at end of file +- ISSO should now work flawlessly on all types of servers (Windows and *NIX) +- Removed an old instance of ERR_WARNING and replaced it with E_USER_WARNING [template.php] diff --git a/template.php b/template.php index 0bb4481..48ef660 100644 --- a/template.php +++ b/template.php @@ -117,7 +117,7 @@ class DB_Template if (sizeof($this->cache) > 0) { - trigger_error('You cannot cache templates more than once per initialization', ERR_WARNING); + trigger_error('You cannot cache templates more than once per initialization', E_USER_WARNING); } else { -- 2.43.5