From e02c5759bba275c273ab16d8923bff3ea6f24663 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Mon, 12 Jan 2009 05:12:17 +0000 Subject: Add a check to (e|i)nsure that the database provided is empty --- installer/install.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'installer/install.php') diff --git a/installer/install.php b/installer/install.php index 9ed20d6d..9802bbd2 100644 --- a/installer/install.php +++ b/installer/install.php @@ -69,8 +69,8 @@ define('THEMEPATH', strtr(realpath('themes') . '/', DIRECTORY_SEPARATOR, '/')); define('SYSPATH', strtr(realpath('kohana') . '/', DIRECTORY_SEPARATOR, '/')); define('EXT', ".php"); -//set_error_handler(array('Kohana', 'exception_handler')); -set_error_handler(create_function('$x, $y', 'throw new Exception($y, $x);')); +set_error_handler(create_function('$errno, $errstr, $errfile, $errline', + 'throw new ErrorException($errstr, 0, $errno, $errfile, $errline);')); // Set exception handler set_exception_handler('exception_handler'); @@ -93,7 +93,7 @@ try { die("Specifed User does not have sufficient authority to install Gallery3\n"); } -$config_valid = installer::check_docroot_writable(); +$config_valid &= installer::check_docroot_writable(); installer::display_requirements(!$config_valid); -- cgit v1.2.3