Ticket #352: 080511_fix_local_config_override.1.diff

a/lib/elgglib.php

@@ -3773 +3773 @@
-    // this was originally in setup.php
-    if ($configs = get_records('datalists')) {
-        $localcfg = (array)$CFG;
+        $forcedcfg = (array)get_manual_config();
-        foreach ($configs as $config) {
-            if (!isset($localcfg[$config->name])) {
-                $localcfg[$config->name] = $config->value;
-            } else {
-
+&& !in_array($config->name, array_keys($forcedcfg))
-                    // complain if the DB has a different
-                    // value than config.php does
-                    //error_log("\$CFG->{$config->name} in config.php ({$localcfg[$config->name]}) overrides database setting ({$config->value})");
@@ -3795 +3796 @@
-        return $CFG;
-    }
-
+}
+
+function get_manual_config() {
+    $CFG = new Stdclass;
+    include(dirname(dirname(__FILE__)) . '/config.php');
+    return (array)$CFG;
-}
-
-function guest_user() {