Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrobocoder <anthon.pang@gmail.com>2009-08-12 08:42:33 +0400
committerrobocoder <anthon.pang@gmail.com>2009-08-12 08:42:33 +0400
commit625e9c0e056d7edc9b7d44c405e6f5b50b8722a2 (patch)
tree229cfc12cde0d27130b745665f9af9a4731a0168 /index.php
parentf10f5cd1a447bbc490cbfcca00daa19e7b53e6d5 (diff)
refs #886 - move bootstrap loading to top where it should be;
refs #917 - adding PIWIK_DISPLAY_ERRORS git-svn-id: http://dev.piwik.org/svn/trunk@1389 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'index.php')
-rw-r--r--index.php14
1 files changed, 9 insertions, 5 deletions
diff --git a/index.php b/index.php
index da5f81ebb8..366c655878 100644
--- a/index.php
+++ b/index.php
@@ -9,8 +9,16 @@
* @package Piwik
*/
+if(file_exists('bootstrap.php'))
+{
+ require_once 'bootstrap.php';
+}
+
error_reporting(E_ALL|E_NOTICE);
-@ini_set('display_errors', 1);
+if(!defined('PIWIK_DISPLAY_ERRORS') || PIWIK_DISPLAY_ERRORS)
+{
+ @ini_set('display_errors', 1);
+}
@ini_set('magic_quotes_runtime', 0);
if(ini_get('session.save_handler') == 'user')
{
@@ -18,10 +26,6 @@ if(ini_get('session.save_handler') == 'user')
@ini_set('session.save_path', '');
}
-if(file_exists('bootstrap.php'))
-{
- require_once 'bootstrap.php';
-}
if(!defined('PIWIK_INCLUDE_PATH'))
{
define('PIWIK_INCLUDE_PATH', dirname(__FILE__));