jenkins-bot has submitted this change and it was merged.
Change subject: Trim HTML in API response on server side instead of client side
......................................................................
Trim HTML in API response on server side instead of client side
Change-Id: I9f61c98b4be2f10563e4c0d1d6165e1922bfe52c
---
M ApiCategoryTree.php
M modules/ext.categoryTree.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ApiCategoryTree.php b/ApiCategoryTree.php
index a57126f..ed956c4 100644
--- a/ApiCategoryTree.php
+++ b/ApiCategoryTree.php
@@ -96,7 +96,7 @@
86400
);
}
- return $html;
+ return trim( $html );
}
public function getAllowedParams() {
diff --git a/modules/ext.categoryTree.js b/modules/ext.categoryTree.js
index 5a53ed2..e004826 100644
--- a/modules/ext.categoryTree.js
+++ b/modules/ext.categoryTree.js
@@ -132,7 +132,7 @@
uselang: mw.config.get( 'wgUserLanguage' ),
formatversion: 2
} ).done( function ( data ) {
- data = data.categorytree.html.replace(
/^\s+|\s+$/, '' );
+ data = data.categorytree.html;
data = data.replace( /##LOAD##/g, mw.msg(
'categorytree-expand' ) );
if ( data === '' ) {
--
To view, visit https://gerrit.wikimedia.org/r/267609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f61c98b4be2f10563e4c0d1d6165e1922bfe52c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CategoryTree
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <[email protected]>
Gerrit-Reviewer: Gerrit Patch Uploader <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
