allow to use system udan11/sql-parser

Signed-off-by: Remi Collet <fedora@famillecollet.com>
phpmyadmin · Sep 14, 2015 · 4185868 · 4185868
1 parent ae77949
commit 4185868
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
@@ -1069,7 +1069,7 @@
         /**
          * Initializes the SQL parsing library.
          */
-        include_once './libraries/sql-parser/autoload.php';
+        include_once SQL_PARSER_AUTOLOAD;
 
         // Loads closest context to this version.
         SqlParser\Context::loadClosest(

diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php
@@ -84,9 +84,13 @@
  */
 define('PHPSECLIB_INC_DIR', './libraries/phpseclib/');
 
+/**
+ * Path to the udan11/sql-parser. Useful when you want to use system version.
+ */
+define('SQL_PARSER_AUTOLOAD', './libraries/sql-parser/autoload.php');
+
 /**
  * Avoid referring to nonexistent files (causes warnings when open_basedir
  * is used)
  */
 define('K_PATH_IMAGES', '');
-