1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Marc Alexander
2017-02-11 15:21:00 +01:00
15 changed files with 33 additions and 33 deletions

View File

@@ -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',