From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 17 Mar 2010 10:48:34 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.1~12^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/df1367050aebe74cbcabaa176a20edaca65208b4?hp=0d55eaaec3f548439f24249adcf67604483c443c

Merge branch 'master' of ssh://lx-office/~/lx-office-erp
---

diff --git a/SL/Form.pm b/SL/Form.pm
index 32ea04d85..ca8d4fc22 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -720,7 +720,7 @@ sub _prepare_html_template {
   my ($self, $file, $additional_params) = @_;
   my $language;
 
-  if (!defined(%main::myconfig) || !defined($main::myconfig{"countrycode"})) {
+  if (!%::myconfig || !$::myconfig{"countrycode"}) {
     $language = $main::language;
   } else {
     $language = $main::myconfig{"countrycode"};