aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2010-02-25 21:48:21 +0000
committerHenry Sudhof <kellanved@phpbb.com>2010-02-25 21:48:21 +0000
commitc2f2bff2aecf642c8d6b9915e15a54d140728eee (patch)
tree3f2c5143c2a32a5525ae3be9796845aa35ba99f7 /phpBB/includes
parentcdc96b0c7d87b3db7a8192b62ffb95044a24434f (diff)
downloadforums-c2f2bff2aecf642c8d6b9915e15a54d140728eee.tar
forums-c2f2bff2aecf642c8d6b9915e15a54d140728eee.tar.gz
forums-c2f2bff2aecf642c8d6b9915e15a54d140728eee.tar.bz2
forums-c2f2bff2aecf642c8d6b9915e15a54d140728eee.tar.xz
forums-c2f2bff2aecf642c8d6b9915e15a54d140728eee.zip
only whitespaces, not newlines
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10540 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_bbcodes.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index ab042f15bf..1e3316c998 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -344,7 +344,7 @@ class acp_bbcodes
'!([a-zA-Z0-9-+.,_ ]+)!' => "$1"
),
'INTTEXT' => array(
- '!([\p{L}\p{N}+-,_.\s]+)!u' => "$1"
+ '!([\p{L}\p{N}+-,_. ]+)!u' => "$1"
),
'IDENTIFIER' => array(
'!([a-zA-Z0-9-_]+)!' => "$1"
@@ -363,7 +363,7 @@ class acp_bbcodes
'EMAIL' => '(' . get_preg_expression('email') . ')',
'TEXT' => '(.*?)',
'SIMPLETEXT' => '([a-zA-Z0-9-+.,_ ]+)',
- 'INTTEXT' => '([\p{L}\p{N}+-,_.\s]+)',
+ 'INTTEXT' => '([\p{L}\p{N}+-,_. ]+)',
'IDENTIFIER' => '([a-zA-Z0-9-_]+)',
'COLOR' => '([a-zA-Z]+|#[0-9abcdefABCDEF]+)',
'NUMBER' => '([0-9]+)',