diff --git a/ChangeLog b/ChangeLog
index 2689f300f..543557733 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-03-23 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/sqlparser.lib.php3, libraries/config_import.lib.php3,
+      config.inc.php3, Documentation.html: disabling of the parser no 
+      longer possible
+
 2003-03-22 Alexander M. Turek  <rabus@users.sourceforge.net>
     * libraries/defines.lib.php3: Small bugfix.
     * libraries/defines_php.lib.php3: New constant: PMA_MYSQL_CLIENT_API.
diff --git a/Documentation.html b/Documentation.html
index 63eecda0f..a28b80794 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -1517,18 +1517,6 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
     <br /><br />
     </dd>
 
-    <dt><b>$cfg['SQP']['enable']</b> boolean</dt>
-    <dd>
-    As of phpMyAdmin 2.3.0, we now have a fully functional SQL Parser system.
-    It is enabled by default, as it is used to format the SQL queries.
-    <br />
-    As of 2.3.1, it will become an integral part of phpMyAdmin, as it will
-    analyze certain queries to improve the behavior of phpMyAdmin. But as
-    it is very new, and not yet heavily used, we offer you an option to
-    turn it off.
-    <br /><br />
-    </dd>
-
     <dt><b>$cfg['SQP']['fmtType']</b> string [<tt>html</tt>|<tt>none</tt>]</dt>
     <dd>
     The main use of the new SQL Parser is to pretty-print SQL queries. By
diff --git a/config.inc.php3 b/config.inc.php3
index a10d99829..2d78d72b6 100755
--- a/config.inc.php3
+++ b/config.inc.php3
@@ -434,7 +434,6 @@ $cfg['UploadDir']             = '';         // for example, './upload/'; you mus
 /**
  * SQL Parser Settings
  */
-$cfg['SQP']['enable']       = TRUE;         // Totally turn off the SQL Parser (not recommended)
 $cfg['SQP']['fmtType']      = 'html';       // Pretty-printing style to use on queries (html, text, none)
 $cfg['SQP']['fmtInd']       = '1';          // Amount to indent each level (floats ok)
 $cfg['SQP']['fmtIndUnit']   = 'em';         // Units for indenting each level (CSS Types - {em,px,pt})
diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3
index c4b8fc4d4..eee209d14 100644
--- a/libraries/config_import.lib.php3
+++ b/libraries/config_import.lib.php3
@@ -770,10 +770,6 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
         $cfg['DBG']['profile']['threshold'] = 0.5;
     }
 
-    if (!isset($cfg['SQP']['enable'])) {
-        $cfg['SQP']['enable'] = TRUE;
-    }
-
     if (!isset($cfg['SQP']['fmtType'])) {
         $cfg['SQP']['fmtType'] = 'html';
     }
diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3
index 89ea455b2..98edb2b17 100644
--- a/libraries/sqlparser.lib.php3
+++ b/libraries/sqlparser.lib.php3
@@ -217,12 +217,6 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
             global $PMA_SQPdata_column_attrib, $PMA_SQPdata_reserved_word, $PMA_SQPdata_column_type, $PMA_SQPdata_function_name,
             $PMA_SQPdata_column_attrib_cnt, $PMA_SQPdata_reserved_word_cnt, $PMA_SQPdata_column_type_cnt, $PMA_SQPdata_function_name_cnt;
     
-            // if the SQL parser is disabled just return the original query string
-            if ($cfg['SQP']['enable'] == FALSE) {
-                // Debug : echo 'FALSE';
-                return $sql;
-            }
-    
             // rabus: Convert all line feeds to Unix style
             $sql = str_replace("\r\n", "\n", $sql);
             $sql = str_replace("\r", "\n", $sql);