From 7b4068da7df45201bcba1516b6025bcde1f2de14 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Sat, 28 Jan 2017 23:05:38 -0500 Subject: [PATCH] Fix undefined index warning with some SSL connections and ssl_ca_paths. Fixes #12929 Signed-off-by: Isaac Bennetch --- ChangeLog | 1 + libraries/dbi/DBIMysqli.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ee97e37e59..e10f8f456a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ phpMyAdmin - ChangeLog - issue #12901 Use server returned table name on renaming table - issue #12918 Always use \r\n as newline when editing fields - issue #12923 Fixed server side search in navigation panel +- issue #12929 Undefined index warning with ssl_ca_paths 4.6.6 (2017-01-23) - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' diff --git a/libraries/dbi/DBIMysqli.php b/libraries/dbi/DBIMysqli.php index e024339602..d2207be61c 100644 --- a/libraries/dbi/DBIMysqli.php +++ b/libraries/dbi/DBIMysqli.php @@ -98,7 +98,7 @@ class DBIMysqli implements DBIExtension if (! is_null($server['ssl_key']) || ! is_null($server['ssl_cert']) || ! is_null($server['ssl_ca']) || - ! is_null($server['ssl_ca_paths']) || + ! is_null($server['ssl_ca_path']) || ! is_null($server['ssl_ciphers']) ) { mysqli_ssl_set(