diff --git a/src/mibew/install/dbperform.php b/src/mibew/install/dbperform.php index 7f64e0ee..28ab0c86 100644 --- a/src/mibew/install/dbperform.php +++ b/src/mibew/install/dbperform.php @@ -29,9 +29,6 @@ session_start(); require_once(MIBEW_FS_ROOT.'/libs/config.php'); -// Include some classes -require_once(MIBEW_FS_ROOT.'/libs/classes/Mibew/PluginManager.php'); - // Include common functions require_once(MIBEW_FS_ROOT.'/libs/common/constants.php'); require_once(MIBEW_FS_ROOT.'/libs/common/locale.php'); diff --git a/src/mibew/install/index.php b/src/mibew/install/index.php index ed01b671..9f3e03cd 100644 --- a/src/mibew/install/index.php +++ b/src/mibew/install/index.php @@ -29,9 +29,6 @@ session_start(); require_once(MIBEW_FS_ROOT.'/libs/config.php'); -// Include some classes -require_once(MIBEW_FS_ROOT.'/libs/classes/Mibew/PluginManager.php'); - // Include common functions require_once(MIBEW_FS_ROOT.'/libs/common/constants.php'); require_once(MIBEW_FS_ROOT.'/libs/common/locale.php'); diff --git a/src/mibew/libs/common/locale.php b/src/mibew/libs/common/locale.php index 853d8789..ee2a1571 100644 --- a/src/mibew/libs/common/locale.php +++ b/src/mibew/libs/common/locale.php @@ -160,20 +160,23 @@ function load_messages($locale) { $messages[$locale] = $locale_data['messages']; - // Load active plugins localization - $plugins_list = array_keys(PluginManager::getAllPlugins()); + // Plugins are unavailable on system installation + if (!installation_in_progress()) { + // Load active plugins localization + $plugins_list = array_keys(PluginManager::getAllPlugins()); - foreach($plugins_list as $plugin_name) { - $locale_file = MIBEW_FS_ROOT . - "/plugins/{$plugin_name}/locales/{$locale}/properties"; - if (is_readable($locale_file)) { - $locale_data = read_locale_file($locale_file); - // array_merge used to provide an ability for plugins to override - // localized strings - $messages[$locale] = array_merge( - $messages[$locale], - $locale_data['messages'] - ); + foreach($plugins_list as $plugin_name) { + $locale_file = MIBEW_FS_ROOT . + "/plugins/{$plugin_name}/locales/{$locale}/properties"; + if (is_readable($locale_file)) { + $locale_data = read_locale_file($locale_file); + // array_merge used to provide an ability for plugins to override + // localized strings + $messages[$locale] = array_merge( + $messages[$locale], + $locale_data['messages'] + ); + } } } }