summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/variable.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/includes/variable.inc b/includes/variable.inc
index 2a1d91a37..511965e16 100644
--- a/includes/variable.inc
+++ b/includes/variable.inc
@@ -2,7 +2,11 @@
function variable_init($conf = array()) {
$result = db_query("SELECT * FROM variable");
- while ($variable = db_fetch_object($result)) $conf[$variable->name] = $variable->value;
+ while ($variable = db_fetch_object($result)) {
+ if (!isset($conf[$variable->name])) {
+ $conf[$variable->name] = $variable->value;
+ }
+ }
return $conf;
}