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

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__));

misc/generateVisits.php

@@ -4,6 +4,11 @@
  * for a given number of days.
  */
 
+if(file_exists('../bootstrap.php'))
+{
+	require_once '../bootstrap.php';
+}
+
 // TODO - generator should generate pages with slash, then test that period archiving doesn't show the unique page view
 // TODO - should generate goals with keyword or referer that are not found for this day, to simulate a referer 5 days ago and conversion today
 $minVisitors = 200;
@@ -13,10 +18,6 @@ $daysToCompute = 5;
 
 //-----------------------------------------------------------------------------
 error_reporting(E_ALL|E_NOTICE);
-if(file_exists('../bootstrap.php'))
-{
-	require_once '../bootstrap.php';
-}
 if(!defined('PIWIK_INCLUDE_PATH'))
 {
 	define('PIWIK_INCLUDE_PATH', '..');

piwik.php

@@ -7,15 +7,16 @@
  * @version $Id$
  */
 
+if(file_exists('bootstrap.php'))
+{
+	require_once 'bootstrap.php';
+}
+
 $GLOBALS['PIWIK_TRACKER_DEBUG'] = false; 
 
 define('PIWIK_TRACKER_MODE', true);
 error_reporting(E_ALL|E_NOTICE);
 
-if(file_exists('bootstrap.php'))
-{
-	require_once 'bootstrap.php';
-}
 if(!defined('PIWIK_INCLUDE_PATH'))
 {
 	define('PIWIK_INCLUDE_PATH', dirname(__FILE__));