From: Holger Lindemann <hli@lenny.hoch.ul>
Date: Mon, 5 Mar 2012 16:33:15 +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~7
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2c6997eca202daacb743c80d1d65c6faed61ad35;hp=e3f9ee435dfdb627d5fec76f8c915301228effa5;p=kivitendo-erp.git

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>";
 			}