aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/message_parser.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-05-18 19:03:25 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-05-18 19:03:25 +0200
commit2911c0168331a8f23dd8836d092d5e3fe6cac070 (patch)
tree594d2e5031e2f40deb749d644fdccc93f9057b04 /phpBB/includes/message_parser.php
parent8a5c0965d34cfd7027983dd74c33f45d737012d3 (diff)
downloadforums-2911c0168331a8f23dd8836d092d5e3fe6cac070.tar
forums-2911c0168331a8f23dd8836d092d5e3fe6cac070.tar.gz
forums-2911c0168331a8f23dd8836d092d5e3fe6cac070.tar.bz2
forums-2911c0168331a8f23dd8836d092d5e3fe6cac070.tar.xz
forums-2911c0168331a8f23dd8836d092d5e3fe6cac070.zip
[ticket/13832] Remove e modifier from bold bbcode
PHPBB3-13832
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r--phpBB/includes/message_parser.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 0528d0b413..e4a89b62ca 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -126,10 +126,12 @@ class bbcode_firstpass extends bbcode
*/
function bbcode_init($allow_custom_bbcode = true)
{
- global $phpbb_dispatcher;
+ global $phpbb_dispatcher, $bbcode_class;
static $rowset;
+ $bbcode_class = $this;
+
// This array holds all bbcode data. BBCodes will be processed in this
// order, so it is important to keep [code] in first position and
// [quote] in second position.
@@ -139,7 +141,7 @@ class bbcode_firstpass extends bbcode
'code' => array('bbcode_id' => 8, 'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#uise' => "\$this->bbcode_code('\$1', '\$2')")),
'quote' => array('bbcode_id' => 0, 'regexp' => array('#\[quote(?:=&quot;(.*?)&quot;)?\](.+)\[/quote\]#uise' => "\$this->bbcode_quote('\$0')")),
'attachment' => array('bbcode_id' => 12, 'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#uise' => "\$this->bbcode_attachment('\$1', '\$2')")),
- 'b' => array('bbcode_id' => 1, 'regexp' => array('#\[b\](.*?)\[/b\]#uise' => "\$this->bbcode_strong('\$1')")),
+ 'b' => array('bbcode_id' => 1, 'regexp' => array('#\[b\](.*?)\[/b\]#uis' => function ($match) { global $bbcode_class; return $bbcode_class->bbcode_strong($match[1]); })),
'i' => array('bbcode_id' => 2, 'regexp' => array('#\[i\](.*?)\[/i\]#uise' => "\$this->bbcode_italic('\$1')")),
'url' => array('bbcode_id' => 3, 'regexp' => array('#\[url(=(.*))?\](?(1)((?s).*(?-s))|(.*))\[/url\]#uiUe' => "\$this->validate_url('\$2', ('\$3') ? '\$3' : '\$4')")),
'img' => array('bbcode_id' => 4, 'regexp' => array('#\[img\](.*)\[/img\]#uiUe' => "\$this->bbcode_img('\$1')")),