diff options
| author | Greg Roach <fisharebest@gmail.com> | 2015-03-02 19:02:26 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2015-03-02 19:02:26 +0000 |
| commit | a6a5bd50f03bb91f5892b69d48bfe0f20b742638 (patch) | |
| tree | 611afc5ab35bfedce63e18ca93daec2c629859ec /app/Module.php | |
| parent | 33e1e30b97c6a8846bb1b86dafcfc632368c0d4d (diff) | |
| download | webtrees-a6a5bd50f03bb91f5892b69d48bfe0f20b742638.tar.gz webtrees-a6a5bd50f03bb91f5892b69d48bfe0f20b742638.tar.bz2 webtrees-a6a5bd50f03bb91f5892b69d48bfe0f20b742638.zip | |
Need 'include' instead of 'require' so we can catch errors
Diffstat (limited to 'app/Module.php')
| -rw-r--r-- | app/Module.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/Module.php b/app/Module.php index a17135316a..99b12e8da5 100644 --- a/app/Module.php +++ b/app/Module.php @@ -191,9 +191,9 @@ abstract class Module { $modules = array(); foreach ($module_names as $module_name) { try { - $module = require WT_ROOT . WT_MODULES_DIR . $module_name . '/module.php'; + $module = include WT_ROOT . WT_MODULES_DIR . $module_name . '/module.php'; $modules[$module->getName()] = $module; - } catch (\Exception $ex) { + } catch (\ErrorException $ex) { // Module has been deleted or is broken? Disable it. Log::addConfigurationLog("Module {$module_name} is missing or broken - disabling it"); Database::prepare( @@ -368,7 +368,7 @@ abstract class Module { foreach (glob(WT_ROOT . WT_MODULES_DIR . '*/module.php') as $file) { try { - $module = require $file; + $module = include $file; $modules[$module->getName()] = $module; Database::prepare("INSERT IGNORE INTO `##module` (module_name, status, menu_order, sidebar_order, tab_order) VALUES (?, ?, ?, ?, ?)") ->execute(array( |