| Index: branches/REL1_16/phase3/config/Installer.php |
| — | — | @@ -47,6 +47,8 @@ |
| 48 | 48 | require_once( "$IP/includes/json/Services_JSON.php" ); |
| 49 | 49 | require_once( "$IP/includes/json/FormatJson.php" ); |
| 50 | 50 | |
| | 51 | +$wgMaxShellMemory = 0; |
| | 52 | + |
| 51 | 53 | # If we get an exception, the user needs to know |
| 52 | 54 | # all the details |
| 53 | 55 | $wgShowExceptionDetails = true; |
| — | — | @@ -2148,7 +2150,7 @@ |
| 2149 | 2151 | return $command; |
| 2150 | 2152 | |
| 2151 | 2153 | $file = str_replace('$1', $command, $versioninfo[0]); |
| 2152 | | - if (strstr(`$file`, $versioninfo[1]) !== false) |
| | 2154 | + if ( strstr( wfShellExec( $file ), $versioninfo[1]) !== false ) |
| 2153 | 2155 | return $command; |
| 2154 | 2156 | } |
| 2155 | 2157 | } |
| — | — | @@ -2239,12 +2241,12 @@ |
| 2240 | 2242 | |
| 2241 | 2243 | # Get a list of available locales |
| 2242 | 2244 | $lines = $ret = false; |
| 2243 | | - exec( '/usr/bin/locale -a', $lines, $ret ); |
| | 2245 | + $lines = wfShellExec( '/usr/bin/locale -a', $ret, true ); |
| 2244 | 2246 | if ( $ret ) { |
| 2245 | 2247 | return false; |
| 2246 | 2248 | } |
| 2247 | 2249 | |
| 2248 | | - $lines = wfArrayMap( 'trim', $lines ); |
| | 2250 | + $lines = wfArrayMap( 'trim', explode( "\n", $lines ) ); |
| 2249 | 2251 | $candidatesByLocale = array(); |
| 2250 | 2252 | $candidatesByLang = array(); |
| 2251 | 2253 | foreach ( $lines as $line ) { |
| Index: branches/REL1_16/phase3/RELEASE-NOTES |
| — | — | @@ -52,6 +52,8 @@ |
| 53 | 53 | as an alias for Special:Upload |
| 54 | 54 | * (bug 25167) Correctly load JS fixes for IE6 (fixing a regression in 1.16.0) |
| 55 | 55 | * (bug 25248) API: paraminfo errors with certain modules |
| | 56 | +* Installer now handles situations when safe_mode is active or exec() |
| | 57 | + and similar functions are disabled better. |
| 56 | 58 | |
| 57 | 59 | == Changes since 1.16 beta 3 == |
| 58 | 60 | |