- 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

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'