jenkins-bot has submitted this change and it was merged.

Change subject: Handle VE sending template parameter keys with leading/trailing 
spaces
......................................................................


Handle VE sending template parameter keys with leading/trailing spaces

Those would lead to a crash in the serializer before.

Change-Id: I3239807d6a4eb569545b4317aad32208036740a6
---
M js/lib/mediawiki.WikitextSerializer.js
1 file changed, 8 insertions(+), 3 deletions(-)

Approvals:
  Subramanya Sastry: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/js/lib/mediawiki.WikitextSerializer.js 
b/js/lib/mediawiki.WikitextSerializer.js
index 1e52206..b00c911 100644
--- a/js/lib/mediawiki.WikitextSerializer.js
+++ b/js/lib/mediawiki.WikitextSerializer.js
@@ -2953,9 +2953,14 @@
                                // then push out remaining (new) parameters
                                keys.forEach(function(k) {
                                        // Don't allow whitespace in keys
-                                       k = k.trim();
-                                       if (origKeys.indexOf(k) === -1) {
-                                               pushArg(k);
+
+                                       var strippedK = k.trim();
+                                       if (origKeys.indexOf(strippedK) === -1) 
{
+                                               if (strippedK !== k) {
+                                                       // copy over
+                                                       tpl.params[strippedK] = 
tpl.params[k];
+                                               }
+                                               pushArg(strippedK);
                                        }
                                });
 

-- 
To view, visit https://gerrit.wikimedia.org/r/73006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3239807d6a4eb569545b4317aad32208036740a6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to