gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '4185868'

Browse Source
This commit is contained in:
Marc Delisle 2015-09-14 10:51:40 -04:00
commit 8ad850a820
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/common.inc.php
View File

@ -1056,7 +1056,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('MySql' . PMA_MYSQL_INT_VERSION);

6
libraries/vendor_config.php
View File

@ -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', '');