From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 30 Dec 2010 14:33:08 +0000 (+0100)
Subject: CSV-Import gefixt: auth.session_content enthält YAML-dedumpte Werte
X-Git-Tag: release-2.6.2beta1~17^2~9^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=565340a0b891da16f6055342d19b79552e8a789b;p=kivitendo-erp.git

CSV-Import gefixt: auth.session_content enthält YAML-dedumpte Werte

Conflicts:

	lxo-import/import_lib.php
---

diff --git a/lxo-import/import_lib.php b/lxo-import/import_lib.php
index 996d21e64..6d9dd879b 100644
--- a/lxo-import/import_lib.php
+++ b/lxo-import/import_lib.php
@@ -351,7 +351,7 @@ function authuser($dbhost,$dbport,$dbuser,$dbpasswd,$dbname,$cookie,$login,$pwd)
     $db=new myDB($dbhost,$dbuser,$dbpasswd,$dbname,$dbport,true);
     if ($cookie) {
         $sql="select sc.session_id,u.id from auth.session_content sc left join auth.user u on ";
-        $sql.="u.login=sc.sess_value left join auth.session s on s.id=sc.session_id ";
+        $sql.="('--- ' || u.login || E'\\n')=sc.sess_value left join auth.session s on s.id=sc.session_id ";
         $sql.="where session_id = '$cookie' and sc.sess_key='login'";// order by s.mtime desc";
         $rs=$db->getAll($sql,"authuser_1");
         if (!$rs) return false;