Index: trunk/phase3/CREDITS |
— | — | @@ -74,6 +74,7 @@ |
75 | 75 | * Happy-melon |
76 | 76 | * Jeremy Baron |
77 | 77 | * Jidanni |
| 78 | +* Jimmy Xu |
78 | 79 | * Juliano F. Ravasi |
79 | 80 | * Karun Dambiec |
80 | 81 | * Lucas Garczewski |
Index: trunk/phase3/includes/GlobalFunctions.php |
— | — | @@ -2326,10 +2326,10 @@ |
2327 | 2327 | $cmd = escapeshellarg( $script ) . " $time $mem $filesize " . escapeshellarg( $cmd ); |
2328 | 2328 | } |
2329 | 2329 | } |
2330 | | - } elseif ( php_uname( 's' ) == 'Windows NT' ) { |
| 2330 | + } elseif ( php_uname( 's' ) == 'Windows NT' && substr( php_uname( 'v' ), 6, 4 ) <= 6001 ) { |
2331 | 2331 | # This is a hack to work around PHP's flawed invocation of cmd.exe |
2332 | 2332 | # http://news.php.net/php.internals/21796 |
2333 | | - $cmd = '"' . $cmd . '"'; // FIXME: breaking Vista sp2/PHP 5.2.9(2) |
| 2333 | + $cmd = '"' . $cmd . '"'; |
2334 | 2334 | } |
2335 | 2335 | wfDebug( "wfShellExec: $cmd\n" ); |
2336 | 2336 | |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -525,6 +525,8 @@ |
526 | 526 | returns false if the page doesn't exist |
527 | 527 | * (bug 20751) ForeignApiRepo now urldecodes filenames when saving to local cache |
528 | 528 | * (bug 20730) Fix to Special:Version ViewVC link for branch checkouts |
| 529 | +* (bug 20353) wfShellExec() was adding extra quotes on Windows Vista, causing |
| 530 | + command line scripts to fail |
529 | 531 | |
530 | 532 | == API changes in 1.16 == |
531 | 533 | |