From 8b9ea6feb4bc0010818f694804d2534cafff4446 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 26 Feb 2003 13:24:41 +0000 Subject: [PATCH] hmm, wasn't aware of changed something here. strange. git-svn-id: file:///svn/phpbb/trunk@3544 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_posting.php | 2 +- phpBB/includes/template.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 78446897b7..4d62320c09 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -163,7 +163,7 @@ class parse_message do { $match[] = "#(?<=.\W|\W.|^\W)" . preg_quote($row['code'], '#') . "(?=.\W|\W.|\W$)#"; - $replace[] = '' . $row['smile_url'] . ''; + $replace[] = '' . $row['emoticon'] . ''; } while ($row = $db->sql_fetchrow($result)); diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index 9f1fe1b57b..3060c31510 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -99,7 +99,7 @@ class Template { { if (empty($filename)) { - message_die(ERROR, "Template error - Empty filename specified for $handle"); + trigger_error("Template error - Empty filename specified for $handle", E_USER_ERROR); } $this->filename[$handle] = $filename;