mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 06:38:00 +02:00
Code Issues Releases Wiki Activity

no-load option for e107::getConfig(); install routine synchronized against latest changes

Browse Source
This commit is contained in:
secretr
2010-10-28 14:05:41 +00:00
parent 2e918adb76
commit 104bed623b
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_handlers/e107_class.php
View File

@@ -745,12 +745,12 @@ class e107
* @param string $name core|core_backup|emote|menu|search|notify|ipool * @param string $name core|core_backup|emote|menu|search|notify|ipool
* @return e_core_pref * @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])) if(!isset(self::$_core_config_arr[$name]))
{ {
e107_require_once(e_HANDLER.'pref_class.php'); 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]; return self::$_core_config_arr[$name];

14
install_.php
View File

@@ -1069,6 +1069,20 @@ class e_install
{ {
$this->logLine('Starting configuration import'); $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. // Basic stuff to get the handlers/classes to work.