diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-12-20 16:11:02 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-12-20 16:11:02 +0100 |
| commit | 558f3cd21cb925395003ebd1a7a226d240f9fccb (patch) | |
| tree | dbb78a977381ec8723f3a8114bc53ce80d3957a0 /phpBB/includes/message_parser.php | |
| parent | e3e34add7f725457b2a6e4809bbfdd6fa576203d (diff) | |
| parent | 121f2394ff92c7497f2f2a11913d02570695e8e4 (diff) | |
| download | forums-558f3cd21cb925395003ebd1a7a226d240f9fccb.tar forums-558f3cd21cb925395003ebd1a7a226d240f9fccb.tar.gz forums-558f3cd21cb925395003ebd1a7a226d240f9fccb.tar.bz2 forums-558f3cd21cb925395003ebd1a7a226d240f9fccb.tar.xz forums-558f3cd21cb925395003ebd1a7a226d240f9fccb.zip | |
Merge remote-tracking branch 'vsephpbb/ticket/12060' into develop
* vsephpbb/ticket/12060: (37 commits)
[ticket/12060] A little less verbose cleanup of event docblocks
[ticket/12060] Further clarifying new event docblocks as much as possible
[ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
[ticket/12060] Remove whitespaces
[ticket/12060] Fix docblock for acp_bbcodes_modify_create event
[ticket/12060] Rename event in message parser to modify_format_display_text_after
[ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sql
[ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block
[ticket/12060] Use separate template event for acp user signature posting buttons
[ticket/12060] Rename event from append to after in acp_bbcodes.html
[ticket/12060] Correctly label alpha versions in event docblocks
[ticket/12060] Fix u_action comments in docblocks
[ticket/12060] Change @since in event docblocks
[ticket/12060] Update the docblock comments in acp core events
[ticket/12060] Refactor u_action in the events that use it
[ticket/12060] Use $sql_ary instead of $sql
[ticket/12060] Update docblock for core event due to addition of another var
[ticket/12060] Remove re-tabbing of html from subsilver2 files
[ticket/12060] Add $update_this_message var to the core event
[ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis
...
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index acd31fd519..b29f587385 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -103,6 +103,8 @@ class bbcode_firstpass extends bbcode */ function bbcode_init($allow_custom_bbcode = true) { + global $phpbb_dispatcher; + static $rowset; // This array holds all bbcode data. BBCodes will be processed in this @@ -162,6 +164,21 @@ class bbcode_firstpass extends bbcode 'regexp' => array($row['first_pass_match'] => str_replace('$uid', $this->bbcode_uid, $row['first_pass_replace'])) ); } + + $bbcodes = $this->bbcodes; + + /** + * Event to modify the bbcode data for later parsing + * + * @event core.modify_bbcode_init + * @var array bbcodes Array of bbcode data for use in parsing + * @var array rowset Array of bbcode data from the database + * @since 3.1.0-a3 + */ + $vars = array('bbcodes', 'rowset'); + extract($phpbb_dispatcher->trigger_event('core.modify_bbcode_init', compact($vars))); + + $this->bbcodes = $bbcodes; } /** @@ -1198,6 +1215,8 @@ class parse_message extends bbcode_firstpass */ function format_display($allow_bbcode, $allow_magic_url, $allow_smilies, $update_this_message = true) { + global $phpbb_dispatcher; + // If false, then the parsed message get returned but internal message not processed. if (!$update_this_message) { @@ -1226,6 +1245,28 @@ class parse_message extends bbcode_firstpass $this->message = bbcode_nl2br($this->message); $this->message = smiley_text($this->message, !$allow_smilies); + $text = $this->message; + $uid = $this->bbcode_uid; + + /** + * Event to modify the text after it is parsed + * + * @event core.modify_format_display_text_after + * @var string text The message text to parse + * @var string uid The bbcode uid + * @var bool allow_bbcode Do we allow bbcodes + * @var bool allow_magic_url Do we allow magic urls + * @var bool allow_smilies Do we allow smilies + * @var bool update_this_message Do we update the internal message + * with the parsed result + * @since 3.1.0-a3 + */ + $vars = array('text', 'uid', 'allow_bbcode', 'allow_magic_url', 'allow_smilies', 'update_this_message'); + extract($phpbb_dispatcher->trigger_event('core.modify_format_display_text_after', compact($vars))); + + $this->message = $text; + $this->bbcode_uid = $uid; + if (!$update_this_message) { unset($this->message); |