$canDl = false;
$sapi = php_sapi_name();
- if( version_compare( PHP_VERSION, '5.3.0', '<' ) ||
- $sapi == 'cli' || $sapi == 'cgi' || $sapi == 'embed' )
- {
+ if( $sapi == 'cli' || $sapi == 'cgi' || $sapi == 'embed' ) {
$canDl = ( function_exists( 'dl' ) && is_callable( 'dl' )
&& wfIniGetBool( 'enable_dl' ) && !wfIniGetBool( 'safe_mode' ) );
}
}
$cmd = $envcmd . $cmd;
- if ( wfIsWindows() ) {
- if ( version_compare( PHP_VERSION, '5.3.0', '<' ) && /* Fixed in 5.3.0 :) */
- ( version_compare( PHP_VERSION, '5.2.1', '>=' ) || php_uname( 's' ) == 'Windows NT' ) )
- {
- # Hack to work around PHP's flawed invocation of cmd.exe
- # http://news.php.net/php.internals/21796
- # Windows 9x doesn't accept any kind of quotes
- $cmd = '"' . $cmd . '"';
- }
- } elseif ( php_uname( 's' ) == 'Linux' ) {
+ if ( php_uname( 's' ) == 'Linux' ) {
$time = intval( $wgMaxShellTime );
$mem = intval( $wgMaxShellMemory );
$filesize = intval( $wgMaxShellFileSize );
throw new MWException( "Unable to read local Selenium Settings from " . $seleniumConfigFile . "\n" );
}
- if ( !defined( 'PHP_VERSION_ID' ) ||
- ( PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 3 ) ) {
- $configArray = self::parse_5_2_ini_file( $seleniumConfigFile );
- } else {
- $configArray = parse_ini_file( $seleniumConfigFile, true );
- }
+ $configArray = parse_ini_file( $seleniumConfigFile, true );
if ( $configArray === false ) {
throw new MWException( "Error parsing " . $seleniumConfigFile . "\n" );
}
return true;
}
- /**
- * PHP 5.2 parse_ini_file() doesn't have support for array keys.
- * This function parses simple ini files with such syntax using just
- * 5.2 functions.
- */
- private static function parse_5_2_ini_file( $ConfigFile ) {
- $file = fopen( $ConfigFile, "rt" );
- if ( !$file ) {
- return false;
- }
- $header = '';
-
- $configArray = array();
-
- while ( ( $line = fgets( $file ) ) !== false ) {
- $line = strtok( $line, "\r\n" );
-
- if ( !$line || $line[0] == ';' ) continue;
-
- if ( $line[0] == '[' && substr( $line, -1 ) == ']' ) {
- $header = substr( $line, 1, -1 );
- $configArray[$header] = array();
- } else {
- $configArray[$header] = array_merge_recursive( $configArray[$header], self::parse_ini_line( $line ) );
- }
- }
- return $configArray;
- }
-
private static function parse_ini_line( $iniLine ) {
static $specialValues = array( 'false' => false, 'true' => true, 'null' => null );
list( $key, $value ) = explode( '=', $iniLine, 2 );