From: Patrick <aeshoh6c@a2s46.a2hosting.com>
Date: Wed, 8 Sep 2010 11:48:28 +0000 (-0400)
Subject: import local changes
X-Git-Url: http://git.pfeifer.ch

import local changes
---

diff --git a/i18n.module b/i18n.module
index 7ca2883..be1d6a0 100644
--- a/i18n.module
+++ b/i18n.module
@@ -781,8 +781,8 @@ function _i18n_variable_exit() {
   if (isset($i18n_conf[$langcode])) {  
     $refresh = FALSE;
     // Rewritten because array_diff_assoc may fail with array variables.
-    foreach ($i18n_conf[$langcode] as $name => $value) {
-      if (isset($conf[$name]) && $value != $conf[$name]) {
+    foreach (variable_get('i18n_variables', array()) as $name) {
+      if (isset($conf[$name]) && isset($i18n_conf[$langcode][$name]) && $conf[$name] != $i18n_conf[$langcode][$name]) {
         $refresh = TRUE;
         $i18n_conf[$langcode][$name] = $conf[$name];
         db_query("DELETE FROM {i18n_variable} WHERE name='%s' AND language='%s'", $name, $langcode);