jenkins-bot has submitted this change and it was merged.
Change subject: Don't escape the delete character
......................................................................
Don't escape the delete character
Escaping the delete character breaks strip markers, so don't do it.
Bug: 68011
Change-Id: Ica97c898209c59c0084bf700d891b28603f79dd1
---
M engines/LuaCommon/lualib/mw.html.lua
M tests/engines/LuaCommon/luaParserTests.txt
2 files changed, 15 insertions(+), 1 deletion(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/engines/LuaCommon/lualib/mw.html.lua
b/engines/LuaCommon/lualib/mw.html.lua
index 5f0f246..0d8bf26 100644
--- a/engines/LuaCommon/lualib/mw.html.lua
+++ b/engines/LuaCommon/lualib/mw.html.lua
@@ -88,7 +88,8 @@
local function cssEncode( s )
-- XXX: I'm not sure this character set is complete.
- return mw.ustring.gsub( s, '[^\32-\57\60-\126]', function ( m )
+ -- bug #68011: allow delete character (\127)
+ return mw.ustring.gsub( s, '[^\32-\57\60-\127]', function ( m )
return string.format( '\\%X ', mw.ustring.codepoint( m ) )
end )
end
diff --git a/tests/engines/LuaCommon/luaParserTests.txt
b/tests/engines/LuaCommon/luaParserTests.txt
index 7a83cef..ba9741d 100644
--- a/tests/engines/LuaCommon/luaParserTests.txt
+++ b/tests/engines/LuaCommon/luaParserTests.txt
@@ -151,6 +151,10 @@
return frame.args[1]
end
+function p.testStrippedCss( frame )
+ return mw.html.create( 'div' ):css( 'color', frame.args[1] )
+end
+
return p
!! endarticle
@@ -474,3 +478,12 @@
<p>good
</p>
!! end
+
+!! test
+Scribunto: Strip markers in CSS
+!! input
+{{#invoke:test|testStrippedCss|<nowiki>#ff0000</nowiki>}}
+!! result
+<div style="color:#ff0000"></div>
+
+!! end
--
To view, visit https://gerrit.wikimedia.org/r/161900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica97c898209c59c0084bf700d891b28603f79dd1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
