mirror of
https://github.com/e107inc/e107.git
synced 2025-08-05 06:07:32 +02:00
no-load option for e107::getConfig(); install routine synchronized against latest changes
This commit is contained in:
@@ -745,12 +745,12 @@ class e107
|
||||
* @param string $name core|core_backup|emote|menu|search|notify|ipool
|
||||
* @return e_core_pref
|
||||
*/
|
||||
public static function getConfig($name = 'core')
|
||||
public static function getConfig($name = 'core', $load = true)
|
||||
{
|
||||
if(!isset(self::$_core_config_arr[$name]))
|
||||
{
|
||||
e107_require_once(e_HANDLER.'pref_class.php');
|
||||
self::$_core_config_arr[$name] = new e_core_pref($name, true);
|
||||
self::$_core_config_arr[$name] = new e_core_pref($name, $load);
|
||||
}
|
||||
|
||||
return self::$_core_config_arr[$name];
|
||||
|
14
install_.php
14
install_.php
@@ -1069,6 +1069,20 @@ class e_install
|
||||
{
|
||||
$this->logLine('Starting configuration import');
|
||||
|
||||
// PRE-CONFIG start - create and register blank config instances - do not load!
|
||||
$config_aliases = array(
|
||||
'core',
|
||||
'core_backup',
|
||||
'emote',
|
||||
'menu',
|
||||
'search',
|
||||
'notify',
|
||||
);
|
||||
foreach ($config_aliases as $alias)
|
||||
{
|
||||
e107::getConfig($alias, false);
|
||||
}
|
||||
// PRE-CONFIG end
|
||||
|
||||
// Basic stuff to get the handlers/classes to work.
|
||||
|
||||
|
Reference in New Issue
Block a user