summaryrefslogtreecommitdiffstats
path: root/phpMyAdmin-pr11481.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-09-23 13:58:26 +0200
committerRemi Collet <fedora@famillecollet.com>2015-09-23 13:58:26 +0200
commit58bc443b227678d277682f7db8cd5e8fec902ae0 (patch)
tree10a3f2b2c361addd4a8eb02adde9c67cf2ed6b8e /phpMyAdmin-pr11481.patch
parent5ff6fc529aa0eaa5c1856554826436c15e94aa73 (diff)
phpMyAdmin: 4.5.0
Diffstat (limited to 'phpMyAdmin-pr11481.patch')
-rw-r--r--phpMyAdmin-pr11481.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/phpMyAdmin-pr11481.patch b/phpMyAdmin-pr11481.patch
deleted file mode 100644
index 84efea4..0000000
--- a/phpMyAdmin-pr11481.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From c3af684194f25e3f15c3f5576828bcce3ac32ae5 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Mon, 14 Sep 2015 16:13:05 +0200
-Subject: [PATCH] allow to use system udan11/sql-parser
-
-Signed-off-by: Remi Collet <remi@fedoraproject.org>
----
- 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 83ff2cc..ea15788 100644
---- 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
-index b9c25c6..7087150 100644
---- a/libraries/vendor_config.php
-+++ b/libraries/vendor_config.php
-@@ -85,8 +85,12 @@
- 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', '');
--