bug #1614004 [relation] foreign key spanning multiple columns are incorrectly displayed

ChangeLog

@@ -19,6 +19,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1679440 Added FAQ entry about header errors under IIS caused by 
   an end-of-line character 
 - [gui] avoid displaying a wide selector in server selection
+- bug #1614004 [relation] foreign key spanning multiple columns are
+  incorrectly displayed
 + [core] added PMA_fatalError() and made use of it
 . [core] added PMA_isValid() and PMA_ifSetOr() for variable handling
 . [i18n] use generic $strOptions

libraries/relation.lib.php

@@ -390,8 +390,11 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both')
 
         foreach ($analyzed_sql[0]['foreign_keys'] AS $one_key) {
 
-        // the analyzer may return more than one column name in the
-        // index list or the ref_index_list
+        // The analyzer may return more than one column name in the
+        // index list or the ref_index_list; if this happens,
+        // the current logic just discards the whole index; having
+        // more than one index field is currently unsupported (see FAQ 3.6)
+            if (count($one_key['index_list']) == 1) {
                 foreach ($one_key['index_list'] AS $i => $field) {
 
             // If a foreign key is defined in the 'internal' source (pmadb)
@@ -425,6 +428,7 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both')
                 }
             }
         }
+    }
 
     /**
      * Emulating relations for some information_schema tables