UltrasonicNXT has submitted this change and it was merged.
Change subject: Fix parsing
......................................................................
Fix parsing
Spotted by NovaFlare. Reverts T53190
Change-Id: Iaffaafce8877ee47426c843598fafae47f4844fc
---
M WikiForum.php
M WikiForumClass.php
2 files changed, 2 insertions(+), 4 deletions(-)
Approvals:
UltrasonicNXT: Verified; Looks good to me, approved
diff --git a/WikiForum.php b/WikiForum.php
index 784a3aa..e656bc8 100644
--- a/WikiForum.php
+++ b/WikiForum.php
@@ -35,7 +35,7 @@
'path' => __FILE__,
'name' => 'WikiForum',
'author' => array( 'Michael Chlebek', 'Jack Phoenix', 'Adam Carter
(UltrasonicNXT)' ),
- 'version' => '2.1.0',
+ 'version' => '2.1.1',
'url' => 'https://www.mediawiki.org/wiki/Extension:WikiForum',
'descriptionmsg' => 'wikiforum-desc'
);
diff --git a/WikiForumClass.php b/WikiForumClass.php
index 695a1cf..d8750cb 100644
--- a/WikiForumClass.php
+++ b/WikiForumClass.php
@@ -252,9 +252,7 @@
static function parseIt( $text ) {
global $wgOut;
- // add smilies for reply text
- $text = WikiForumClass::prepareSmilies( $text );
- $text = nl2br( $text ); // convert single line breaks into
proper breaks
+ $text = WikiForumClass::prepareSmilies( $text ); // add smilies
for reply text
$text = $wgOut->parse( $text );
$text = WikiForumClass::parseLinks( $text );
$text = WikiForumClass::parseQuotes( $text );
--
To view, visit https://gerrit.wikimedia.org/r/185669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaffaafce8877ee47426c843598fafae47f4844fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiForum
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT <[email protected]>
Gerrit-Reviewer: UltrasonicNXT <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
