Next 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 3148d37ff1ff0b5fa06fce7c4bfbd5f8f68b1e72..ba074262d3123d2117875e3783b236f4deb1e02a 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -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