diff --git a/libraries/Util.php b/libraries/Util.php
index 0505692a4c..0588709bf4 100644
--- a/libraries/Util.php
+++ b/libraries/Util.php
@@ -4064,7 +4064,7 @@ class Util
         $functions = $GLOBALS['PMA_Types']->getFunctions($field['True_Type']);
         foreach ($functions as $function) {
             $retval .= '<option';
-            if ($foreignData['foreign_link'] !== false && $default_function === $function) {
+            if (isset($foreignData['foreign_link']) && $foreignData['foreign_link'] !== false && $default_function === $function) {
                 $retval .= ' selected="selected"';
             }
             $retval .= '>' . $function . '</option>' . "\n";
diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
index 0f901a369d..292fd5b6a3 100644
--- a/libraries/rte/rte_routines.lib.php
+++ b/libraries/rte/rte_routines.lib.php
@@ -1650,7 +1650,7 @@ function PMA_RTN_getExecuteForm($routine)
                 );
                 $retval .= "<select name='funcs["
                     . $routine['item_param_name'][$i] . "]'>";
-                $retval .= PMA\libraries\Util::getFunctionsForField($field, false);
+                $retval .= PMA\libraries\Util::getFunctionsForField($field, false, array());
                 $retval .= "</select>";
             }
             $retval .= "</td>\n";
diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php
index a61d1bf1d4..68145897c4 100644
--- a/test/libraries/PMA_insert_edit_test.php
+++ b/test/libraries/PMA_insert_edit_test.php
@@ -562,7 +562,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $this->assertContains(
             '<td class="center">Binary</td>',
             PMA_getFunctionColumn(
-                $column, false, '', '', array(), 0, 0, 0, false, false
+                $column, false, '', '', array(), 0, 0, 0, false, false, array()
             )
         );
 
@@ -571,7 +571,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $this->assertContains(
             '<td class="center">Binary</td>',
             PMA_getFunctionColumn(
-                $column, true, '', '', array(), 0, 0, 0, false, false
+                $column, true, '', '', array(), 0, 0, 0, false, false, array()
             )
         );
 
@@ -580,7 +580,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $this->assertContains(
             '<td class="center">Binary</td>',
             PMA_getFunctionColumn(
-                $column, true, '', '', array(), 0, 0, 0, false, false
+                $column, true, '', '', array(), 0, 0, 0, false, false, array()
             )
         );
 
@@ -589,7 +589,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $this->assertContains(
             '<td class="center">--</td>',
             PMA_getFunctionColumn(
-                $column, true, '', '', array(), 0, 0, 0, false, false
+                $column, true, '', '', array(), 0, 0, 0, false, false, array()
             )
         );
 
@@ -597,7 +597,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $this->assertContains(
             '<td class="center">--</td>',
             PMA_getFunctionColumn(
-                $column, true, '', '', array(), 0, 0, 0, false, false
+                $column, true, '', '', array(), 0, 0, 0, false, false, array()
             )
         );
 
@@ -606,7 +606,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $this->assertContains(
             '<td class="center">--</td>',
             PMA_getFunctionColumn(
-                $column, true, '', '', array('int'), 0, 0, 0, false, false
+                $column, true, '', '', array('int'), 0, 0, 0, false, false, array()
             )
         );
 
@@ -615,7 +615,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $this->assertContains(
             '<select name="funcsa" b tabindex="5" id="field_3_1"',
             PMA_getFunctionColumn(
-                $column, true, 'a', 'b', array(), 2, 3, 3, false, false
+                $column, true, 'a', 'b', array(), 2, 3, 3, false, false, array()
             )
         );
     }