Fix undefined index warning with some SSL connections and ssl_ca_paths.

Fixes #12929 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
phpmyadmin · Jan 29, 2017 · 7b4068d · 7b4068d
1 parent d3af64d
commit 7b4068d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -98,7 +98,7 @@ public function connect(
             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(