diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-24 14:59:26 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-24 14:59:26 +0000 |
| commit | d529f78adb85698c9382ad29e4583f309eaf850a (patch) | |
| tree | 58f973b636dac28e93c10274fc58b3bff777afc8 /phpBB/includes/bbcode.php | |
| parent | a0c3a326bd0e0162217589c57af90e7b477e4e88 (diff) | |
| download | forums-d529f78adb85698c9382ad29e4583f309eaf850a.tar forums-d529f78adb85698c9382ad29e4583f309eaf850a.tar.gz forums-d529f78adb85698c9382ad29e4583f309eaf850a.tar.bz2 forums-d529f78adb85698c9382ad29e4583f309eaf850a.tar.xz forums-d529f78adb85698c9382ad29e4583f309eaf850a.zip | |
rather large update, most important things done:
- implemented provided patch/diff file for bug #5350 (Highway of Life) with some tiny changes and alterations
- more username/colour changes/fixes
- added a note about PM rule-dependant message removals so the user is not wondering too much if he can't remember his rules. :)
- some column changes to fix unicode issues
- bugfixes
git-svn-id: file:///svn/phpbb/trunk@6650 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 409aab18e4..9536abddd3 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -221,7 +221,7 @@ class bbcode { $this->bbcode_cache[$bbcode_id] = array( 'preg' => array( - '#\[img:$uid\](.*?)\[/img:$uid\]#s' => str_replace('$2', '[ img ]', $this->bbcode_tpl('url', $bbcode_id)), + '#\[img:$uid\](.*?)\[/img:$uid\]#s' => str_replace('$2', '[ img ]', $this->bbcode_tpl('url', $bbcode_id, true)), ) ); } @@ -300,7 +300,7 @@ class bbcode { $this->bbcode_cache[$bbcode_id] = array( 'preg' => array( - '#\[flash=([0-9]+),([0-9]+):$uid\](.*?)\[/flash:$uid\]#' => str_replace('$1', '$3', str_replace('$2', '[ flash ]', $this->bbcode_tpl('url', $bbcode_id))) + '#\[flash=([0-9]+),([0-9]+):$uid\](.*?)\[/flash:$uid\]#' => str_replace('$1', '$3', str_replace('$2', '[ flash ]', $this->bbcode_tpl('url', $bbcode_id, true))) ) ); } @@ -381,7 +381,7 @@ class bbcode /** * Return bbcode template */ - function bbcode_tpl($tpl_name, $bbcode_id = -1) + function bbcode_tpl($tpl_name, $bbcode_id = -1, $skip_bitfield_check = false) { if (empty($bbcode_hardtpl)) { @@ -403,7 +403,7 @@ class bbcode $template_bitfield = new bitfield($this->template_bitfield); } - if ($bbcode_id != -1 && !$template_bitfield->get($bbcode_id)) + if ($bbcode_id != -1 && !$template_bitfield->get($bbcode_id) && !$skip_bitfield_check) { return (isset($bbcode_hardtpl[$tpl_name])) ? $bbcode_hardtpl[$tpl_name] : false; } |