From: Holger Lindemann <hli@lenny.hoch.ul>
Date: Fri, 23 Mar 2012 10:52:41 +0000 (+0100)
Subject: Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~344^2^2~5
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/df00b423d92a1b0485b755a8fbc6474696ed453f?hp=adfd706307acc01dadc875da489119eab6510dbb

Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp
---

diff --git a/xtcom/confedit.php b/xtcom/confedit.php
index 0d3fb7eef..a3d864804 100644
--- a/xtcom/confedit.php
+++ b/xtcom/confedit.php
@@ -252,7 +252,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
 					fputs($f,"\$Language[$key]=array(\"ERP\"=>$val,\"SHOP\"=>".$_POST["SHOPlang"][$key].");\n");
 			}
 			if (!$DefaultLangOk) {
-				fputs($f,"\$SHOPdbname=\"\";\n");
+				//fputs($f,"\$SHOPdbname=\"\";\n");
 				echo "Es wurde keine ERP-Sprache der Shopdefaultsprache zugewiesen.";
 				echo "Verbindung zum Shop abgebrochen<br>";
 			}