MarkTraceur has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181425
Change subject: Sanitize | characters in descriptions
......................................................................
Sanitize | characters in descriptions
Bug: T78336
Change-Id: I058e1e687c664c0f290a2642d84ae1d916adcd41
---
M resources/uw/model/uw.model.Description.js
M tests/qunit/mw.uw.model.Description.test.js
2 files changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/25/181425/1
diff --git a/resources/uw/model/uw.model.Description.js
b/resources/uw/model/uw.model.Description.js
index 76ac9e2..9c11393 100644
--- a/resources/uw/model/uw.model.Description.js
+++ b/resources/uw/model/uw.model.Description.js
@@ -65,7 +65,7 @@
return '';
}
- return '{{' + this.language + '|1=' + this.text + '}}';
+ return '{{' + this.language + '|1=' + this.text.replace( /\|/g,
'{{!}}' ) + '}}';
};
/**
diff --git a/tests/qunit/mw.uw.model.Description.test.js
b/tests/qunit/mw.uw.model.Description.test.js
index 7a32861..a695bfc 100644
--- a/tests/qunit/mw.uw.model.Description.test.js
+++ b/tests/qunit/mw.uw.model.Description.test.js
@@ -17,7 +17,7 @@
( function ( uw ) {
QUnit.module( 'uw.model.Description', QUnit.newMwEnvironment( {} ) );
- QUnit.test( 'getValue', 3, function ( assert ) {
+ QUnit.test( 'getValue', 4, function ( assert ) {
var desc = new uw.model.Description();
assert.strictEqual( desc.getValue(), '', 'Empty value returns
empty string.' );
@@ -27,5 +27,8 @@
desc.setLanguage( 'en' );
assert.strictEqual( desc.getValue(), '{{en|1=Blah}}', 'Setting
language returns template call to that language template.' );
+
+ desc.setText( 'Blah | blah' );
+ assert.strictEqual( desc.getValue(), '{{en|1=Blah {{!}}
blah}}', 'Escaping of | characters' );
} );
}( mediaWiki.uploadWizard ) );
--
To view, visit https://gerrit.wikimedia.org/r/181425
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I058e1e687c664c0f290a2642d84ae1d916adcd41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur <mtrac...@member.fsf.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
