? 486370-lang.patch Index: domain_conf/domain_conf.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_conf/domain_conf.module,v retrieving revision 1.46 diff -u -p -r1.46 domain_conf.module --- domain_conf/domain_conf.module 14 Jun 2009 19:29:49 -0000 1.46 +++ domain_conf/domain_conf.module 24 Jun 2009 15:08:50 -0000 @@ -37,13 +37,15 @@ function domain_conf_domain_bootstrap_fu // Overwrite the $conf variables. foreach ($settings as $key => $value) { // Language handling is a special case. - $language = (bool) db_result(db_query("SELECT status FROM {system} WHERE name = 'locale' AND type = 'module'")); - if ($key == 'language_default' && $language) { - $temp = db_fetch_object(db_query("SELECT * FROM {languages} WHERE language = '%s'", $value)); - if (!empty($temp)) { - $value = $temp; - $GLOBALS['language'] = $temp; - $conf[$key] = $value; + if ($key == 'language_default') { + $language = (bool) db_result(db_query("SELECT status FROM {system} WHERE name = 'locale' AND type = 'module'")); + if ($language) { + $temp = db_fetch_object(db_query("SELECT * FROM {languages} WHERE language = '%s'", $value)); + if (!empty($temp)) { + $value = $temp; + $GLOBALS['language'] = $temp; + $conf[$key] = $value; + } } } else {