From 41858689dd085920b99a1bb3b8cf310897c67a87 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 14 Sep 2015 10:47:37 -0400 Subject: [PATCH] allow to use system udan11/sql-parser Signed-off-by: Remi Collet --- libraries/common.inc.php | 2 +- libraries/vendor_config.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 83ff2cc278..ea15788d13 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -1069,7 +1069,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * 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 index b9c25c6c1b..70871509b6 100644 --- a/libraries/vendor_config.php +++ b/libraries/vendor_config.php @@ -84,9 +84,13 @@ define('TCPDF_INC', './libraries/tcpdf/tcpdf.php'); */ 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', ''); -