Changeset 1589

Show
Ignore:
Timestamp:
05/13/08 09:12:16 (3 months ago)
Author:
misja
Message:

Misja Hoebe <misja@curverider.co.uk> Applied attachment:ticket:352:080511_fix_local_config_override.1.diff, closes #352

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • devel/lib/elgglib.php

    r1561 r1589  
    37703770    if ($configs = get_records('datalists')) { 
    37713771        $localcfg = (array)$CFG; 
     3772        $forcedcfg = (array)get_manual_config(); 
    37723773        foreach ($configs as $config) { 
    37733774            if (!isset($localcfg[$config->name])) { 
    37743775                $localcfg[$config->name] = $config->value; 
    37753776            } else { 
    3776                 if ($localcfg[$config->name] != $config->value ) { 
     3777                if ($localcfg[$config->name] != $config->value && !in_array($config->name, array_keys($forcedcfg))) { 
    37773778                    // complain if the DB has a different 
    37783779                    // value than config.php does 
    …… 
    37923793    } 
    37933794 
     3795} 
     3796 
     3797function get_manual_config() { 
     3798    $CFG = new Stdclass; 
     3799    include(dirname(dirname(__FILE__)) . '/config.php'); 
     3800    return (array)$CFG; 
    37943801} 
    37953802