Return raw query in case of error (bug #1048826).

ChangeLog

@@ -9,6 +9,8 @@ $Source$
     * export.php: Use just \n for SQL exports (bug #1042521).
     * libraries/read_dump.lib.php: Set correct return value (bug #1048861).
     * sql.php: Fix undefined index.
+    * libraries/sqlparser.lib.php: Return raw query in case of error (bug
+      #1048826).
 
 2004-10-17 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/turkish update, thanks to boralioglu.

libraries/sqlparser.lib.php

@@ -1675,13 +1675,13 @@ if ($is_minimum_common == FALSE) {
     function PMA_SQP_formatHtml($arr, $mode='color', $start_token=0,
         $number_of_tokens=-1)
     {
-        // first check for the SQL parser having hit an error
-        if (PMA_SQP_isError()) {
-            return $arr;
-        }
         // then check for an array
         if (!is_array($arr)) {
-            return $arr;
+            return htmlspecialchars($arr);
+        }
+        // first check for the SQL parser having hit an error
+        if (PMA_SQP_isError()) {
+            return htmlspecialchars($arr['raw']);
         }
         // else do it properly
         switch ($mode) {