diff options
| author | javiexin <javiexin@gmail.com> | 2017-03-05 15:07:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-05 15:07:26 +0100 |
| commit | 376e85c1d66c7223027afcdbfccf5c9e985cca73 (patch) | |
| tree | b68cff3c8b8b982b55580766b87f25e3db65dfdf /phpBB/includes/message_parser.php | |
| parent | fc50fd272b9685221e130114b2365b23bd543048 (diff) | |
| parent | 9267235f30b3275b4b00f49f99c6ae259ce26a3f (diff) | |
| download | forums-376e85c1d66c7223027afcdbfccf5c9e985cca73.tar forums-376e85c1d66c7223027afcdbfccf5c9e985cca73.tar.gz forums-376e85c1d66c7223027afcdbfccf5c9e985cca73.tar.bz2 forums-376e85c1d66c7223027afcdbfccf5c9e985cca73.tar.xz forums-376e85c1d66c7223027afcdbfccf5c9e985cca73.zip | |
Merge branch '3.1.x' into ticket/15081
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 16b65fb83e..bbd5e84233 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1171,7 +1171,7 @@ class parse_message extends bbcode_firstpass * @var bool return Do we return after the event is triggered if $warn_msg is not empty * @var array warn_msg Array of the warning messages * @since 3.1.2-RC1 - * @change 3.1.3-RC1 Added vars $bbcode_bitfield and $bbcode_uid + * @changed 3.1.3-RC1 Added vars $bbcode_bitfield and $bbcode_uid */ $message = $this->message; $warn_msg = $this->warn_msg; |