mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 00:37:42 +02:00
Code Issues Releases Wiki Activity

- BBCode parsing order should ALWAYS be censor_text(), bbcode_secon_pass(), bbcode_nl2br(), smiley_text(), parse_attachments()

Browse Source 
- using \r on custom bbcodes to allow line breaks [Bug #10758]


git-svn-id: file:///svn/phpbb/trunk@8050 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann
2007-08-19 13:40:53 +00:00
parent b8b85e5aca
commit d104d3d969
19 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/functions_profile_fields.php
View File

@@ -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", '<br />', $value);
$value = bbcode_nl2br($value);
return $value;
break;