Fix #12099 Undefined index: controllink

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Mar 16, 2016 · 2f1c996 · 2f1c996
1 parent c8e51a1
commit 2f1c996
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -57,6 +57,7 @@ phpMyAdmin - ChangeLog
 - issue #11705 Fixed problems with PHP on Windows on table structure
 - issue #12085 Like search strings being escaped incorrectly
 - issue #12092 Rename exported databases/tables doesn't seem to work
+- issue #12099 Undefined index: controllink
 
 4.5.5.1 (2016-02-29)
 - issue #11971 CREATE UNIQUE INDEX index type is not recognized by parser.

diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
@@ -483,6 +483,7 @@ function PMA_checkRelationsParam()
 
     if ($GLOBALS['server'] == 0
         || empty($GLOBALS['cfg']['Server']['pmadb'])
+        || empty($GLOBALS['controllink'])
         || ! $GLOBALS['dbi']->selectDb(
             $GLOBALS['cfg']['Server']['pmadb'], $GLOBALS['controllink']
         )