r78565 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r78564‎ | r78565 | r78566 >
Date:15:00, 18 December 2010
Author:btongminh
Status:ok
Tags:
Comment:
Follow-up r75476: Windows set command treats everything until the && as part of the environment variable, resulting in a trailing whitespace which breaks stuff.
Modified paths:
  • /trunk/phase3/includes/GlobalFunctions.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/GlobalFunctions.php
@@ -2511,7 +2511,7 @@
25122512 * Note however that the quote isn't listed there, but is needed, and the parentheses
25132513 * are listed there but doesn't appear to need it.
25142514 */
2515 - $envcmd .= "set $k=" . preg_replace( '/([&|()<>^"])/', '^\\1', $v ) . ' && ';
 2515+ $envcmd .= "set $k=" . preg_replace( '/([&|()<>^"])/', '^\\1', $v ) . '&& ';
25162516 } else {
25172517 /* Assume this is a POSIX shell, thus required to accept variable assignments before the command
25182518 * http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_09_01

Follow-up revisions

RevisionCommit summaryAuthorDate
r79129MFT r78011 r78014 r78015 r78016 r78099 r78117 r78161 r78170 r78172 r78199 r78......platonides19:58, 28 December 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r75476Provide a proper implementation for passing environment variables to wfShellE...platonides22:17, 26 October 2010

Status & tagging log