From 94a123c5376bd6a0b9eca5a3cbe4fb8932bf7789 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 26 Oct 2008 12:15:26 +0000
Subject: [PATCH] also using default cli exceptin handler

---
 filemanager/cli.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/filemanager/cli.php b/filemanager/cli.php
index 05720df663..4cf65b6c96 100755
--- a/filemanager/cli.php
+++ b/filemanager/cli.php
@@ -491,6 +491,7 @@ function load_egw($user,$passwd,$domain='default')
 			'currentapp' => 'filemanager',
 			'noheader' => true,
 			'autocreate_session_callback' => 'user_pass_from_argv',
+			'no_exception_handler' => 'cli',
 		)
 	);
 
@@ -516,7 +517,6 @@ function load_egw($user,$passwd,$domain='default')
 			die("Unknown user or password!\n");
 		}
 	}
-	set_exception_handler('cli_exception_handler');	// otherwise we get html!
 
 	$cmd = $GLOBALS['cmd'];
 	if (!in_array($cmd,array('ls','find','mount','umount','eacl')) && $GLOBALS['egw_info']['server']['files_dir'] && !is_writable($GLOBALS['egw_info']['server']['files_dir']))
@@ -780,12 +780,6 @@ function do_find($bases,$options)
 	}
 }
 
-function cli_exception_handler(Exception $e)
-{
-	echo $e->getMessage()."\n";
-	exit($e->getCode());
-}
-
 /**
  * Convert a numerical mode to a symbolic mode-string
  *