From c74d2538ec68fa1c6f3da6d26e31a09f2045557b Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 21 Feb 2004 12:47:35 +0000 Subject: - put consoring and smilie processing into functions (we use them all over the place) for better changing and consistency. - changed docs/AUTHORS to reflect the recent code re-use in functions_messenger.php - pleasing the users a little bit more by using table constants. :D - login box if "mode" is not allowed -> posting (thought about trigger_error integration, but we do not need this that often). git-svn-id: file:///svn/phpbb/trunk@4836 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_admin.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'phpBB/includes/functions_admin.php') diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 6309dda87d..865be1065e 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -1745,12 +1745,6 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id $profile_url = (defined('IN_ADMIN')) ? "admin_users.$phpEx$SID" : "memberlist.$phpEx$SID&mode=viewprofile"; - $censors = array(); - if ($user->optionget('viewcensors')) - { - obtain_word_list($censors); - } - switch ($mode) { case 'admin': @@ -1824,11 +1818,7 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id { foreach ($log_data_ary as $log_data) { - if (sizeof($censors) && $user->optionget('viewcensors')) - { - $log_data = preg_replace($censors['match'], $censors['replace'], $log_data); - } - $log_data = str_replace("\n", '
', $log_data); + $log_data = str_replace("\n", '
', censor_text($log_data)); $log[$i]['action'] = preg_replace('#%s#', $log_data, $log[$i]['action'], 1); } -- cgit v1.2.1