Index: branches/5.2.x/core/install/install_toolkit.php =================================================================== diff -u -N -r14860 -r14863 --- branches/5.2.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 14860) +++ branches/5.2.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 14863) @@ -1,6 +1,6 @@ getSystemConfig('Misc', 'CompressionEngine'); } - $output = shell_exec('java -version'); + $output = shell_exec('java -version 2>&1'); $compression_engines = Array ('' => 'None', 'yui' => 'YUICompressor (Java)', 'php' => 'PHP-based'); - if ( strpos($output, 'Java Version') === false ) { + if ( stripos($output, 'java version') === false ) { if ( $current == 'yui' ) { $compression_engines['yui'] .= ' (offline)'; } Index: branches/5.2.x/core/install/prerequisites.php =================================================================== diff -u -N -r14860 -r14863 --- branches/5.2.x/core/install/prerequisites.php (.../prerequisites.php) (revision 14860) +++ branches/5.2.x/core/install/prerequisites.php (.../prerequisites.php) (revision 14863) @@ -1,6 +1,6 @@ &1'); + $ret['java'] = stripos($output, 'java version') !== false; + $ret['memory_limit'] = $this->isPhpSettingChangeable('memory_limit', '33M'); $ret['date.timezone'] = ini_get('date.timezone') != ''; Index: branches/5.2.x/core/install/step_templates/sys_requirements.tpl =================================================================== diff -u -N -r14860 -r14863 --- branches/5.2.x/core/install/step_templates/sys_requirements.tpl (.../sys_requirements.tpl) (revision 14860) +++ branches/5.2.x/core/install/step_templates/sys_requirements.tpl (.../sys_requirements.tpl) (revision 14863) @@ -13,6 +13,7 @@ $check_titles = Array ( 'php_version' => 'PHP version: 5.2+ (required)', 'url_rewriting' => 'URL Rewriting Support (optional)', + 'java' => 'Java (optional)', 'sep1' => 'PHP extensions:', 'memcache' => '- Memcache (optional)', 'curl' => '- Curl (required)',