UltrasonicNXT has submitted this change and it was merged.
Change subject: Let smileys have < or > in them
......................................................................
Let smileys have < or > in them
Before, < and < were being compared, now $lt; and $lt; are being
compared, so they work.
Brickimedia/brickimedia#227
Change-Id: I7ead492b093f1961bd12e722bdb8e27ac5d4676a
---
M MediaWikiChat.php
M MediaWikiChatClass.php
2 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
UltrasonicNXT: Verified; Looks good to me, approved
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index c90a871..37df2a2 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -17,7 +17,7 @@
$wgExtensionCredits['specialpage'][] = array(
'path' => __FILE__,
'name' => 'MediaWikiChat',
- 'version' => '2.6.5',
+ 'version' => '2.6.6',
'author' => 'Adam Carter/UltrasonicNXT',
'url' => 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' => 'chat-desc',
diff --git a/MediaWikiChatClass.php b/MediaWikiChatClass.php
index 914d161..495abec 100644
--- a/MediaWikiChatClass.php
+++ b/MediaWikiChatClass.php
@@ -206,15 +206,17 @@
$message = trim( $message );
} else {
- $message = htmlentities($message);
+ $message = htmlentities( $message );
$message = preg_replace( '#(http[s]?\:\/\/[^ \n]+)#',
'<a target="_blank" href="$1">$1</a>', $message );
}
$message = str_replace( ' ', ' ', str_replace( ' ', '
', $message ) );
- $rawSmileyData = wfMessage( 'smileys' )->plain();
- $smileyData = explode( '*', $rawSmileyData );
+ $smileyString = wfMessage( 'smileys' )->plain();
+ $smileyString = str_replace( '<', '<', $smileyString ); //
these make smileys with them in work,
+ $smileyString = str_replace( '>', '>', $smileyString ); //
as otherwise '>' and '<' are compared
+ $smileyData = explode( '*', $smileyString );
$message = ' ' . $message . ' '; // to allow smileys at
beginning/end of message
--
To view, visit https://gerrit.wikimedia.org/r/115200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ead492b093f1961bd12e722bdb8e27ac5d4676a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT <[email protected]>
Gerrit-Reviewer: UltrasonicNXT <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
