add error_reporting sanity

avoid many E_NOTICEs for those installations which run with E_ALL

darcs-hash:20060728090404-9b6ab-0506bb5ad3af38456762bd578db3f230195505c1.gz

2 files changed, 5 insertions, 1 deletions

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 85af612b3..1bf75da1a 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -201,7 +201,7 @@ $lang['i_installer']  = 'DokuWiki Installer';
 $lang['i_wikiname']   = 'Wiki Name';
 $lang['i_enableacl']  = 'Enable ACL (recommended)';
 $lang['i_superuser']  = 'Superuser';
-$lang['i_problems']   = 'The installer found some problems, indicated below. You can not continue until you fixed them.';
+$lang['i_problems']   = 'The installer found some problems, indicated below. You can not continue until you have fixed them.';
 $lang['i_modified']   = 'For security reasons this script will only work with a new and unmodified Dokuwiki installation.
                          You should either re-extract the files from the downloaded package or consult the complete
                          <a href="http://wiki.splitbrain.org/wiki:install">Dokuwiki installation instructions</a>';
diff --git a/install.php b/install.php
index 59829f896..cc179f856 100644
--- a/install.php
+++ b/install.php
@@ -9,6 +9,10 @@ if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__)).'/');
 if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
 if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_INC.'conf/');
 
+// check for error reporting override or set error reporting to sane values
+if (!defined('DOKU_E_LEVEL')) { error_reporting(E_ALL ^ E_NOTICE); }
+else { error_reporting(DOKU_E_LEVEL); }
+
 // kill magic quotes
 if (get_magic_quotes_gpc() && !defined('MAGIC_QUOTES_STRIPPED')) {
     if (!empty($_GET))    remove_magic_quotes($_GET);