r111450 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r111449‎ | r111450 | r111451 >
Date:07:28, 14 February 2012
Author:wikinaut
Status:ok
Tags:
Comment:
follow-up r111437 : Etherpad Lite requires indeed the userName rawurlencoded, not urlencoded as coded by wfAppendQuery. Appending &userName= manually now.
Modified paths:
  • /trunk/extensions/EtherpadLite/EtherpadLite.php (modified) (history)

Diff [purge]

Index: trunk/extensions/EtherpadLite/EtherpadLite.php
@@ -64,7 +64,7 @@
6565 'path' => __FILE__,
6666 'name' => 'EtherpadLite',
6767 'author' => array( 'Thomas Gries' ),
68 - 'version' => '1.06 20120213',
 68+ 'version' => '1.07 20120214',
6969 'url' => 'https://www.mediawiki.org/wiki/Extension:EtherpadLite',
7070 'descriptionmsg' => 'etherpadlite-desc',
7171 );
@@ -170,15 +170,16 @@
171171
172172 $parser->disableCache();
173173
 174+ # Etherpad Lite requires rawurlencoded userName, thus we must add it manually
 175+
174176 $url = wfAppendQuery( $url, array(
175177 "showControls" => $showControls,
176178 "showChat" => $showChat,
177179 "showLineNumbers" => $showLineNumbers,
178180 "useMonospaceFont" => $useMonospaceFont,
179181 "noColors" => $noColors,
180 - "userName" => rawurlencode( $wgUser->getName() ),
181182 )
182 - );
 183+ ) . "&userName=" . rawurlencode( $wgUser->getName() );
183184
184185 # @todo One could potentially stuff other css in the width argument
185186 # since ; isn't checked for. Since overall css is checked for allowed

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r111437follow-up r111424 - Simplify some of the security checks that were doing the ...bawolff00:53, 14 February 2012

Status & tagging log