diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-02-13 16:24:59 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-02-13 16:24:59 +0000 |
| commit | 659f6376ca5e0d184585ef40dfc2e3c5256e4f17 (patch) | |
| tree | 311640cdd82a02bf76d6ea0458040517b761d20f /engine/start.php | |
| parent | 1ddb05d873cc0b5c03bdfad9ff27a29babc03e85 (diff) | |
| download | elgg-659f6376ca5e0d184585ef40dfc2e3c5256e4f17.tar.gz elgg-659f6376ca5e0d184585ef40dfc2e3c5256e4f17.tar.bz2 | |
Exception handling
git-svn-id: https://code.elgg.org/elgg/trunk@25 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/start.php')
| -rw-r--r-- | engine/start.php | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/engine/start.php b/engine/start.php index 412081a93..03274ae4b 100644 --- a/engine/start.php +++ b/engine/start.php @@ -24,7 +24,15 @@ if (!@include_once(dirname(__FILE__) . "/lib/elgglib.php")) { // Main Elgg library
throw new InstallationException("Could not load the main Elgg library.");
}
-
+
+ /**
+ * Establish handlers
+ */
+
+ // Register the error handler
+ set_error_handler('__elgg_php_error_handler');
+ set_exception_handler('__elgg_php_exception_handler');
+
/**
* Load the system settings
*/
@@ -58,7 +66,7 @@ $file_exceptions = array(
'.','..',
'.svn', - 'CVS',
+ 'CVS','cvs',
'settings.php','settings.example.php','elgglib.php','database.php'
);
@@ -82,16 +90,5 @@ // Trigger events
trigger_event('init', 'system');
- - -// TODO: Have the View catch and render any exceptions
- // If we have load errors, display them
-/* if ($count = count_messages("errors")) {
- echo elgg_view('pageshell', array(
- 'title' => "Elgg isn't ready to run just yet.",
- 'body' => elgg_view('messages/errors/list',array('object' => system_messages(null, "errors")))
- ));
- exit;
- }
-*/
+
?>
\ No newline at end of file |