From 6c09b4bd58cc893c65655846036b897bb73091bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sat, 8 Oct 2005 09:14:36 +0000
Subject: [PATCH] This one does not handle charset conversion.

---
 ChangeLog                | 1 +
 libraries/import/ldi.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0156ba14c..49af1728f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $Source$
 
 2005-10-08 Michal Čihař  <michal@cihar.com>
     * libraries/display_export.lib.php: Use same formatting for all options.
+    * libraries/import/ldi.php: This one does not handle charset conversion.
 
 2005-10-07 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/check_user_privileges.lib.php: bug #1313821, dbname containing a 
diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php
index f80d15013..81d46ada5 100644
--- a/libraries/import/ldi.php
+++ b/libraries/import/ldi.php
@@ -43,7 +43,7 @@ if ($import_type == 'table') {
             );
     } else {
     /* We do not define function when plugin is just queried for information above */
-        if ($import_file == 'none' || $compression != 'none') {
+        if ($import_file == 'none' || $compression != 'none' || $charset_converion) {
             // We handle only some kind of data!
             $message = $strInvalidLDIImport;
             $show_error_header = TRUE;