Changeset 568 for trunk/includes/global.php

Timestamp:

Aug 21, 2013, 9:27:56 PM (11 years ago)

Author:

chronos

Message:

 

File:

• trunk/includes/global.php (modified) (3 diffs)

trunk/includes/global.php

@@ -6 +6 @@
 include_once(dirname(__FILE__).'/rss.php');
 include_once(dirname(__FILE__).'/Page.php');
-include_once(dirname(__FILE__).'/error.php');
 if(file_exists(dirname(__FILE__).'/config.php')) 
   include_once(dirname(__FILE__).'/config.php');
@@ -14 +13 @@
 // Include application modules
 // TODO: Make modules configurable
+include_once(dirname(__FILE__).'/../Modules/Error/Error.php');
 include_once(dirname(__FILE__).'/../Modules/Log/Log.php');
 include_once(dirname(__FILE__).'/../Modules/Translation/Translation.php');
@@ -62 +62 @@
   }
   foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($_GET[$Index]);
-  
-  set_error_handler('ErrorHandler');
-  set_exception_handler('ExceptionHandler'); 
-
+    
   // TODO: Global initialized variable should be removed
   $TranslationTree = GetTranslationTree();
   
   // Initialize application modules
+  $System->ModuleManager->RegisterModule(new ModuleError($System));
   $System->ModuleManager->RegisterModule(new ModuleLog($System));
   $System->ModuleManager->RegisterModule(new ModuleUser($System));