From 487ca9229997f0bd1c5ed228cf7dc3a033fce329 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 16 Aug 2007 12:19:26 +0000 Subject: - added information about Unicode to coding guidelines - two little changes git-svn-id: file:///svn/phpbb/trunk@8035 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/message_parser.php | 2 +- phpBB/includes/utf/utf_tools.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/includes') diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index fda31a20e3..c2d40670af 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1371,7 +1371,7 @@ class parse_message extends bbcode_firstpass include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); $index = array_keys(request_var('delete_file', array(0 => 0))); - $index = (!empty($index[0])) ? $index[0] : false; + $index = (!empty($index)) ? $index[0] : false; if ($index !== false && !empty($this->attachment_data[$index])) { diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index f8156fb8d2..a3499062fe 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -908,8 +908,8 @@ function utf8_recode($string, $encoding) } // Trigger an error?! Fow now just give bad data :-( - //trigger_error('Unknown encoding: ' . $encoding, E_USER_ERROR); - return $string; + trigger_error('Unknown encoding: ' . $encoding, E_USER_ERROR); + //return $string; // use utf_normalizer::cleanup() ? } /** -- cgit v1.2.1