diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-02 15:47:23 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-02 15:47:23 +0000 |
commit | 1d1b5e6446667cc03cb765c789e269b4efa7e3a8 (patch) | |
tree | 4c61193c8211363f6a70e38748c022df1e984e41 /phpBB/includes/functions_admin.php | |
parent | 9850d7756ac0a140077264b8a152ff15495aa229 (diff) | |
download | forums-1d1b5e6446667cc03cb765c789e269b4efa7e3a8.tar forums-1d1b5e6446667cc03cb765c789e269b4efa7e3a8.tar.gz forums-1d1b5e6446667cc03cb765c789e269b4efa7e3a8.tar.bz2 forums-1d1b5e6446667cc03cb765c789e269b4efa7e3a8.tar.xz forums-1d1b5e6446667cc03cb765c789e269b4efa7e3a8.zip |
some fixes...
git-svn-id: file:///svn/phpbb/trunk@7266 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
-rw-r--r-- | phpBB/includes/functions_admin.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index e9319dac33..a0fb8ddd54 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2370,7 +2370,16 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id if (isset($user->lang[$row['log_operation']])) { $log[$i]['action'] = vsprintf($log[$i]['action'], $log_data_ary); - $log[$i]['action'] = str_replace("\n", '<br />', censor_text($log[$i]['action'])); + + // If within the admin panel we do not censor text out + if (defined('IN_ADMIN')) + { + $log[$i]['action'] = str_replace("\n", '<br />', $log[$i]['action']); + } + else + { + $log[$i]['action'] = str_replace("\n", '<br />', censor_text($log[$i]['action'])); + } } else { |