holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for bug #2965 - "setup-cli.php --check" prints additional unintended lines on exit code 14

Browse Source
This commit is contained in:
Ralf Becker 2011-05-28 07:23:02 +00:00
parent 145cf9ce68
commit 9fe576f050
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
setup/setup-cli.php
View File

@ -38,13 +38,8 @@ if (ini_get('session.save_handler') == 'files' && !is_writable(ini_get('session.
ini_set('session.save_path','/tmp'); // regular users may have no rights to apache's session dir ini_set('session.save_path','/tmp'); // regular users may have no rights to apache's session dir
} }
// setting up the $GLOBALS['egw_setup'] object AND including the header.inc.php if it exists // setting up the $GLOBALS['egw_setup'] object AND including the header.inc.php if it exists
$GLOBALS['egw_info'] = array(
'flags' => array(
'currentapp' => 'setup',
'noapi' => true,
'no_exception_handler' => 'cli',
));
include('inc/functions.inc.php'); include('inc/functions.inc.php');
$GLOBALS['egw_info']['flags']['no_exception_handler'] = 'cli'; // inc/functions.inc.php does NOT set it
$GLOBALS['egw_setup']->system_charset = $charset; $GLOBALS['egw_setup']->system_charset = $charset;
if ((float) PHP_VERSION < $GLOBALS['egw_setup']->required_php_version) if ((float) PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)