diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-28 19:15:24 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-28 19:15:24 +0000 |
| commit | 19a36ed364ffdc4da784a253baa8aa2a8ac6845a (patch) | |
| tree | a355181dc26b47abb2c34228fe32a92fd40df28d /phpBB/includes/acp | |
| parent | ebf4f4ec8e787153e16cc6cec6fc5fefadc97107 (diff) | |
| download | forums-19a36ed364ffdc4da784a253baa8aa2a8ac6845a.tar forums-19a36ed364ffdc4da784a253baa8aa2a8ac6845a.tar.gz forums-19a36ed364ffdc4da784a253baa8aa2a8ac6845a.tar.bz2 forums-19a36ed364ffdc4da784a253baa8aa2a8ac6845a.tar.xz forums-19a36ed364ffdc4da784a253baa8aa2a8ac6845a.zip | |
- adjusted coding guidelines
- fixed custom bbcode {TEXT} token
- added unapproved item/info for unapproved posts in a topic
git-svn-id: file:///svn/phpbb/trunk@5982 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 4586a58fe8..4f7f4b191b 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -233,7 +233,7 @@ class acp_bbcodes '!([a-z0-9]+[a-z0-9\-\._]*@(?:(?:[0-9]{1,3}\.){3,5}[0-9]{1,3}|[a-z0-9]+[a-z0-9\-\._]*\.[a-z]+))!i' => '$1' ), 'TEXT' => array( - '!(.*?)!es' => "str_replace('\\\"', '"', str_replace('\\'', ''', '\$1'))" + '!(.*?)!es' => "str_replace(\"\\r\\n\",\"\\n\", str_replace('\\\"', '\"', str_replace('\\'', ''', trim('\$1'))))" ), 'COLOR' => array( '!([a-z]+|#[0-9abcdef]+)!i' => '$1' |