From c74d2538ec68fa1c6f3da6d26e31a09f2045557b Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
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/adm/admin_users.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/adm/admin_users.php')

diff --git a/phpBB/adm/admin_users.php b/phpBB/adm/admin_users.php
index 4dac8f1673..9cefdaeb78 100644
--- a/phpBB/adm/admin_users.php
+++ b/phpBB/adm/admin_users.php
@@ -614,7 +614,7 @@ if ($submit || $preview || $deleteall || $deletemark)
 				// Update Custom Fields
 				if (sizeof($cp_data))
 				{
-					$sql = 'UPDATE phpbb_profile_fields_data
+					$sql = 'UPDATE ' . CUSTOM_PROFILE_DATA . '
 						SET ' . $db->sql_build_array('UPDATE', $cp_data) . "
 						WHERE user_id = $user_id";
 					$db->sql_query($sql);
@@ -1557,15 +1557,15 @@ function marklist(match, status)
 
 				// If we allow users to disable display of emoticons
 				// we'll need an appropriate check and preg_replace here
-				$signature_preview = (empty($enable_smilies) || empty($config['allow_smilies'])) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $signature_preview) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $phpbb_root_path . $config['smilies_path'], $signature_preview);
+				$signature_preview = smilie_text($signature_preview, !$enable_smilies);
 
 				// Replace naughty words such as farty pants
-				if (sizeof($censors))
+/*				if (sizeof($censors))
 				{
 					$signature_preview = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$censors['match'], \$censors['replace'], '\\0')", '>' . $signature_preview . '<'), 1, -1));
-				}
+				}*/
 
-				$signature_preview = str_replace("\n", '<br />', $signature_preview);
+				$signature_preview = str_replace("\n", '<br />', censor_text($signature_preview));
 			}
 
 			decode_text($user_sig, $user_sig_bbcode_uid);
-- 
cgit v1.2.1