First batch of fixed language ids (renamed, see ticket #219)

[mailer.git] / inc / config-functions.php

diff --git a/inc/config-functions.php b/inc/config-functions.php
index c85f60ada1a43b71030df9df3ae5d03048622adb..ba074262d3123d2117875e3783b236f4deb1e02a 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -97,6 +97,8 @@ function isConfigEntrySet ($configEntry) {
 // Merges $GLOBALS['config'] with data in given array
 function mergeConfig ($newConfig) {
        $GLOBALS['config'] = merge_array(getConfigArray(), $newConfig);
+
+       // Remove all cached entries
 }
 
 // Increment or init with given value or 1 as default the given config entry
@@ -271,7 +273,7 @@ function updateOldConfigFile () {
 }
 
 // Update config entries
-function updateConfiguration ($entries, $values, $updateMode='', $config = '0') {
+function updateConfiguration ($entries, $values, $updateMode = '', $config = '0') {
        // Do not update config in CSS mode
        if ((isCssOutputMode()) || (isRawOutputMode()) || (isInstallationPhase())) {
                // This logger line may be very noisy