summaryrefslogtreecommitdiff
path: root/core/helpers/module.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2008-12-17 18:32:08 +0000
committerBharat Mediratta <bharat@menalto.com>2008-12-17 18:32:08 +0000
commitfa5a8fde4a378c4a4940eba323de7e2e61054d36 (patch)
tree7f5ef7767dfbc36b8e138e954e34a5adb41c696f /core/helpers/module.php
parent130e26983aedac1e4bb9f26d6a82c629248075e8 (diff)
Switch from cookie sessions to database sessions. We can't use cookie
sessions; it encodes all the value into the cookie which means little/no security, transfer costs, and storage limits.
Diffstat (limited to 'core/helpers/module.php')
-rw-r--r--core/helpers/module.php16
1 files changed, 5 insertions, 11 deletions
diff --git a/core/helpers/module.php b/core/helpers/module.php
index 5713901d..c26a8257 100644
--- a/core/helpers/module.php
+++ b/core/helpers/module.php
@@ -116,9 +116,11 @@ class module_Core {
// Do The Right Thing.
//
// @todo get rid of this extra error checking when we have an installer.
- set_error_handler(array("module", "_dummy_error_handler"));
- $modules = ORM::factory("module")->find_all();
- restore_error_handler();
+ try {
+ $modules = ORM::factory("module")->find_all();
+ } catch (Exception $e) {
+ return;
+ }
// Reload module list from the config file since we'll do a refresh after calling install()
$core = Kohana::config_load('core');
@@ -164,12 +166,4 @@ class module_Core {
$var->value = $value;
$var->save();
}
-
- /**
- * Dummy error handler used in module::load_modules.
- *
- * @todo remove this when we have an installer.
- */
- public static function _dummy_error_handler() {
- }
}