From 9fe576f0506a1e320277c5a6d44d997d8e04043a Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 28 May 2011 07:23:02 +0000 Subject: [PATCH] fix for bug #2965 - "setup-cli.php --check" prints additional unintended lines on exit code 14 --- setup/setup-cli.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/setup/setup-cli.php b/setup/setup-cli.php index 9b6b11a02d..5b2fe35cba 100755 --- a/setup/setup-cli.php +++ b/setup/setup-cli.php @@ -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 } // 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'); +$GLOBALS['egw_info']['flags']['no_exception_handler'] = 'cli'; // inc/functions.inc.php does NOT set it $GLOBALS['egw_setup']->system_charset = $charset; if ((float) PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)