diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-02-11 15:21:00 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-02-11 21:48:20 +0100 |
| commit | f27cdad73e7a4af913414522d85855136bf50b31 (patch) | |
| tree | 33ce0eb4d82bdf011b6235b60daea812c3902982 /phpBB/includes/message_parser.php | |
| parent | 59ad9401d9db8c6b6612f01f7b295f12c4cdccf7 (diff) | |
| parent | 45199adebdfc00f436a719de1c5772429367b756 (diff) | |
| download | forums-f27cdad73e7a4af913414522d85855136bf50b31.tar forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.gz forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.bz2 forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.xz forums-f27cdad73e7a4af913414522d85855136bf50b31.zip | |
Merge branch '3.1.x' into 3.2.x
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 c68ff87cd7..d6e36fec39 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1219,7 +1219,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; |