gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust code to changes in #12372

Browse Source 
Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-11-10 10:55:59 +01:00
parent 32a381d0a5
commit 08840559ba
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/Util.php
View File

@ -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";

2
libraries/rte/rte_routines.lib.php
View File

@ -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";

14
test/libraries/PMA_insert_edit_test.php
View File

@ -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()
)
);
}