Fix importing files without trailing new line (bug #1473944).

ChangeLog

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-04-21 Michal Čihař  <michal@cihar.com>
+    * libraries/import/csv.php: Fix importing files without trailing new line
+      (bug #1473944).
+
 2006-04-20 Michal Čihař  <michal@cihar.com>
     * index.php: Check target against goto_whitelist.
     * libraries/url_generating.lib.php, libraries/session.inc.php,

libraries/import/csv.php

@@ -191,13 +191,16 @@ if ($plugin_param == 'table') {
                     }
                     // Need to strip trailing enclosing char?
                     if ($need_end && $ch == $csv_enclosed) {
-                        if ($i == $len - 1) {
+                        if ($finished && $i == $len - 1) {
+                            $ch = NULL;
+                        } elseif ($i == $len - 1) {
                             $i = $fallbacki;
                             $ch = $buffer[$i];
                             break;
+                        } else {
+                            $i++;
+                            $ch = $buffer[$i];
                         }
-                        $i++;
-                        $ch = $buffer[$i];
                     }
                     // Are we at the end?
                     if ($ch == $csv_new_line || ($csv_new_line == 'auto' && ($ch == "\r" || $ch == "\n")) || ($finished && $i == $len - 1)) {