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 996d21e..6d9dd87 100644 (file)
--- 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;