From d104d3d969d2fbc77f1004e0e5369e8c0c15738f Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 19 Aug 2007 13:40:53 +0000 Subject: - BBCode parsing order should ALWAYS be censor_text(), bbcode_secon_pass(), bbcode_nl2br(), smiley_text(), parse_attachments() - using \r on custom bbcodes to allow line breaks [Bug #10758] git-svn-id: file:///svn/phpbb/trunk@8050 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_profile_fields.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/includes/functions_profile_fields.php') diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php index f3ebe429cd..cbad80e28e 100644 --- a/phpBB/includes/functions_profile_fields.php +++ b/phpBB/includes/functions_profile_fields.php @@ -176,7 +176,7 @@ class custom_profile if (!empty($field_data['field_validation']) && $field_data['field_validation'] != '.*') { - $field_validate = ($field_type == FIELD_STRING) ? $field_value : str_replace("\n", ' ', $field_value); + $field_validate = ($field_type == FIELD_STRING) ? $field_value : bbcode_nl2br($field_value); if (!preg_match('#^' . str_replace('\\\\', '\\', $field_data['field_validation']) . '$#i', $field_validate)) { return 'FIELD_INVALID_CHARS'; @@ -462,7 +462,7 @@ class custom_profile $value = make_clickable($value); $value = censor_text($value); - $value = str_replace("\n", '
', $value); + $value = bbcode_nl2br($value); return $value; break; -- cgit v1.2.1