diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-11-02 16:26:29 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-11-02 16:26:29 +0100 |
| commit | 8a78699f6c5e51465e8d066a4683b5f09a31eea1 (patch) | |
| tree | 6526773d4cb87eb04012f5c82a720a29fe0f35de /phpBB/includes/functions_content.php | |
| parent | 158c998216c91d21dd19a14f847bcf20275f5973 (diff) | |
| parent | 7a02a8bcf20b79feb996c2508e647c21f3a0ac70 (diff) | |
| download | forums-8a78699f6c5e51465e8d066a4683b5f09a31eea1.tar forums-8a78699f6c5e51465e8d066a4683b5f09a31eea1.tar.gz forums-8a78699f6c5e51465e8d066a4683b5f09a31eea1.tar.bz2 forums-8a78699f6c5e51465e8d066a4683b5f09a31eea1.tar.xz forums-8a78699f6c5e51465e8d066a4683b5f09a31eea1.zip | |
Merge remote-tracking branch 'brunoais/ticket/11663' into develop
* brunoais/ticket/11663:
[ticket/11663] Add the doc block about the parameters.
[ticket/11663] Add the doc block about the return value.
[ticket/11663] Make generate_text_for_storage return the errors.
Diffstat (limited to 'phpBB/includes/functions_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index c5347ef262..8122b87e4b 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -481,6 +481,16 @@ function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text * For parsing custom parsed text to be stored within the database. * This function additionally returns the uid and bitfield that needs to be stored. * Expects $text to be the value directly from request_var() and in it's non-parsed form +* +* @param string $text The text to be replaced with the parsed one +* @param string $uid The BBCode uid for this parse +* @param string $bitfield The BBCode bitfield for this parse +* @param int $flags The allow_bbcode, allow_urls and allow_smilies compiled into a single integer. +* @param bool $allow_bbcode If BBCode is allowed (i.e. if BBCode is parsed) +* @param bool $allow_urls If urls is allowed +* @param bool $allow_smilies If smilies are allowed +* +* @return array An array of string with the errors that occurred while parsing */ function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bbcode = false, $allow_urls = false, $allow_smilies = false) { @@ -542,7 +552,7 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bb $vars = array('text', 'uid', 'bitfield', 'flags'); extract($phpbb_dispatcher->trigger_event('core.modify_text_for_storage_after', compact($vars))); - return; + return $message_parser->warn_msg; } /** |