jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329693 )
Change subject: Some cleanup to the parser ...................................................................... Some cleanup to the parser Change-Id: Ibf7401fb5e810063cc48c4ecb4b435502434604f --- M MediaWikiChatClass.php M extension.json 2 files changed, 3 insertions(+), 8 deletions(-) Approvals: UltrasonicNXT: Looks good to me, approved jenkins-bot: Verified diff --git a/MediaWikiChatClass.php b/MediaWikiChatClass.php index 0a8ef65..cab5b26 100644 --- a/MediaWikiChatClass.php +++ b/MediaWikiChatClass.php @@ -178,7 +178,7 @@ * @return String: parsed message */ static function parseMessage( $message, $user ) { - global $wgChatRichMessages, $wgUploadPath, $wgChatUseStyleAttribute; + global $wgChatRichMessages, $wgChatUseStyleAttribute; $smileyString = wfMessage( 'smileys' )->plain(); $smileyData = explode( '*', $smileyString ); @@ -199,7 +199,7 @@ } if ( $wgChatRichMessages ) { - $message = str_ireplace( '[[File:', '[[:File:', $message ); // prevent users showing huge local images in chat + $message = str_ireplace( '[[', '[[:', $message ); // prevent users showing huge local images in chat if ( !$wgChatUseStyleAttribute ) { $message = preg_replace( '#<([a-zA-z].+?) (.?)style=["\'].+?["\'](.?)>#', '<$1 $2$3>', $message ); // remove style attribute of html elements @@ -224,7 +224,6 @@ $opts->setExternalLinkTarget( '_blank' ); $opts->setAllowSpecialInclusion( false ); $opts->setAllowExternalImages( false ); - $opts->setRemoveComments( true ); $parser = new Parser(); @@ -243,10 +242,6 @@ ); $message = $parseOut->getText(); - - $message = str_replace( '<p>', '', $message ); // remove MW's automatical p, - $message = str_replace( '</p>', '', $message ); // it's pointless - $message = trim( $message ); } else { $message = htmlentities( $message ); diff --git a/extension.json b/extension.json index 6a08f0d..fc44525 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "MediaWikiChat", - "version": "2.19.3", + "version": "2.19.4", "author": [ "Adam Carter/UltrasonicNXT" ], -- To view, visit https://gerrit.wikimedia.org/r/329693 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibf7401fb5e810063cc48c4ecb4b435502434604f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiChat Gerrit-Branch: master Gerrit-Owner: UltrasonicNXT <adamr_car...@btinternet.com> Gerrit-Reviewer: UltrasonicNXT <adamr_car...@btinternet.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits