From bae7ebbf9e81132aa2b0ad5b245f83fc2d21f517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= <jahvascriptmaniac+github@free.fr>
Date: Tue, 5 Oct 2010 16:27:04 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20des=20deux=20commit=20pr=C3=A9c=C3=A9d?=
 =?UTF-8?q?ents?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cms2/code/index.php | 18 ++++++------------
 cms2/code/main.php  |  6 ------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/cms2/code/index.php b/cms2/code/index.php
index 0c50cf1..04c0305 100644
--- a/cms2/code/index.php
+++ b/cms2/code/index.php
@@ -1,19 +1,13 @@
 <?php
 
 error_reporting(E_ALL | E_STRICT);
-ini_set("display_errors", 1); // Ne s'appliquera pas au fichier courant !
+// display_errors ne s'appliquera pas au fichier courant,
+// alors gardons-le aussi court que possible !
+ini_set("display_errors", 1);
 
-require_once(dirname(__FILE__) . "/debug.php");
+require_once(dirname(__FILE__) . "/configuration.php");
+require_once(dirname(__FILE__) . "/include.php");
 
-$old_error_handler = set_error_handler(array("Debug", "error_handler"), E_ALL | E_STRICT);
-$old_error_handler = set_error_handler(array("Debug", "error_handler"), E_ALL | E_STRICT);
-register_shutdown_function(array("Debug", "error_handler"));
-
-if ($old_error_handler === null) {
-	echo "<pre>Erreur lors de la mise en place des mécanismes de détection et d'affichage d'erreurs.</pre>";
-	die();
-}
-
-require_once(dirname(__FILE__) . "/main.php");
+main();
 
 ?>
\ No newline at end of file
diff --git a/cms2/code/main.php b/cms2/code/main.php
index 6a6009b..e6a0b5b 100644
--- a/cms2/code/main.php
+++ b/cms2/code/main.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once(dirname(__FILE__) . "/configuration.php");
-require_once(dirname(__FILE__) . "/include.php");
-
 function main() {
 	$g = new GalerieIndex();
 	$g->res_h_page();
@@ -10,7 +7,4 @@ function main() {
 	Debug::afficher();
 }
 
-//trigger_error("ABCDE", E_USER_NOTICE);
-main();
-
 ?>
\ No newline at end of file