diff options
Diffstat (limited to 'core/helpers')
| -rw-r--r-- | core/helpers/core_installer.php | 7 | ||||
| -rw-r--r-- | core/helpers/module.php | 16 |
2 files changed, 12 insertions, 11 deletions
diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php index de4c51d9..f71bec6d 100644 --- a/core/helpers/core_installer.php +++ b/core/helpers/core_installer.php @@ -82,6 +82,13 @@ class core_installer { UNIQUE KEY(`name`)) ENGINE=InnoDB DEFAULT CHARSET=utf8;"); + $db->query("CREATE TABLE `sessions` ( + `session_id` varchar(127) NOT NULL, + `last_activity` int(10) UNSIGNED NOT NULL, + `data` text NOT NULL, + PRIMARY KEY (`session_id`)) + ENGINE=InnoDB DEFAULT CHARSET=utf8;"); + $db->query("CREATE TABLE `vars` ( `id` int(9) NOT NULL auto_increment, `module_id` int(9), 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() { - } } |