diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-08-17 23:53:06 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-08-17 23:53:06 +0000 |
| commit | d25ca29ca032d73ab1824179c86e6a08ddaba1f4 (patch) | |
| tree | 780b1a898a92f4430ead61cce5fbe23d3cb84f75 /phpBB/includes | |
| parent | 8257d1c82809165608b33268a561b53fd78675a4 (diff) | |
| download | forums-d25ca29ca032d73ab1824179c86e6a08ddaba1f4.tar forums-d25ca29ca032d73ab1824179c86e6a08ddaba1f4.tar.gz forums-d25ca29ca032d73ab1824179c86e6a08ddaba1f4.tar.bz2 forums-d25ca29ca032d73ab1824179c86e6a08ddaba1f4.tar.xz forums-d25ca29ca032d73ab1824179c86e6a08ddaba1f4.zip | |
- strip_bbcode should not treat smilies which look like BBCode and are placed in front of a closing tag as BBCode
- highlight in post subjects and topic titles
- language entry SMILIE_ONE_ADDED should have been SMILIES_ONE_ADDED
git-svn-id: file:///svn/phpbb/trunk@8045 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ea8b45116a..ab30aba48d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2527,7 +2527,7 @@ function strip_bbcode(&$text, $uid = '') $uid = '[0-9a-z]{5,}'; } - $text = preg_replace("#\[\/?[a-z0-9\*\+\-]+(?:=.*?)?(?::[a-z])?(\:?$uid)\]#", ' ', $text); + $text = preg_replace("#\[\/?[a-z0-9\*\+\-]+(?:=(?:".*"|[^\]]*))?(?::[a-z])?(\:$uid)\]#", ' ', $text); $match = get_preg_expression('bbcode_htm'); $replace = array('\1', '\1', '\2', '\1', '', ''); @@ -3689,6 +3689,8 @@ function msg_handler($errno, $msg_text, $errfile, $errline) { return; } + static $counter = 0; + $counter++; //echo "<b>"; var_dump($counter); echo "</b>"; if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false) { |