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/functions_content.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/functions_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 9ec965a6a1..387606a300 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -686,7 +686,7 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bb * @var bool allow_url_bbcode Whether or not to parse the [url] BBCode * @var string mode Mode to parse text as, e.g. post or sig * @since 3.1.0-a1 - * @changed 3.2.0-a1 + * @changed 3.2.0-a1 Added mode */ $vars = array( 'text', |