summaryrefslogtreecommitdiff
path: root/installer/install.php
diff options
context:
space:
mode:
Diffstat (limited to 'installer/install.php')
-rw-r--r--installer/install.php6
1 files changed, 3 insertions, 3 deletions
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);