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

Merge branch 'QA_4_6'

Browse Source
This commit is contained in:
Michal Čihař 2016-11-10 10:56:46 +01:00
commit fb279cbd22
5 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -118,6 +118,7 @@ phpMyAdmin - ChangeLog
- issue #12681 Fixed designer with tables using special chars
- issue #12652 Fixed visual query builder for foreign keys with more fields
- issue #12257 Improved search page performance
- issue #12322 Avoid selecting default function for foreign keys
4.6.4 (2016-08-16)
- issue [security] Weaknesses with cookie encryption, see PMASA-2016-29

4
libraries/Util.php
View File

@ -3901,7 +3901,7 @@ class Util
* @return string An HTML snippet of a dropdown list with function
* names appropriate for the requested column.
*/
public static function getFunctionsForField($field, $insert_mode)
public static function getFunctionsForField($field, $insert_mode, $foreignData)
{
$default_function = self::getDefaultFunctionForField($field, $insert_mode);
$dropdown_built = array();
@ -3913,7 +3913,7 @@ class Util
$functions = $GLOBALS['PMA_Types']->getFunctions($field['True_Type']);
foreach ($functions as $function) {
$retval .= '<option';
if ($default_function === $function) {
if (isset($foreignData['foreign_link']) && $foreignData['foreign_link'] !== false && $default_function === $function) {
$retval .= ' selected="selected"';
}
$retval .= '>' . $function . '</option>' . "\n";

14
libraries/insert_edit.lib.php
View File

@ -382,12 +382,13 @@ function PMA_getEnumSetAndTimestampColumns($column, $timestamp_seen)
* @param integer $idindex id index
* @param boolean $insert_mode insert mode or edit mode
* @param boolean $readOnly is column read only or not
* @param array $foreignData foreign key data
*
* @return string an html snippet
*/
function PMA_getFunctionColumn($column, $is_upload, $column_name_appendix,
$onChangeClause, $no_support_types, $tabindex_for_function,
$tabindex, $idindex, $insert_mode, $readOnly
$tabindex, $idindex, $insert_mode, $readOnly, $foreignData
) {
$html_output = '';
if (($GLOBALS['cfg']['ProtectBinary'] === 'blob'
@ -413,7 +414,8 @@ function PMA_getFunctionColumn($column, $is_upload, $column_name_appendix,
. ' id="field_' . $idindex . '_1">';
$html_output .= PMA\libraries\Util::getFunctionsForField(
$column,
$insert_mode
$insert_mode,
$foreignData
) . "\n";
$html_output .= '</select>' . "\n";
@ -2852,19 +2854,19 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $column_number,
// The function column
// -------------------
$foreignData = PMA_getForeignData(
$foreigners, $column['Field'], false, '', ''
);
if ($GLOBALS['cfg']['ShowFunctionFields']) {
$html_output .= PMA_getFunctionColumn(
$column, $is_upload, $column_name_appendix,
$onChangeClause, $no_support_types, $tabindex_for_function,
$tabindex, $idindex, $insert_mode, $readOnly
$tabindex, $idindex, $insert_mode, $readOnly, $foreignData
);
}
// The null column
// ---------------
$foreignData = PMA_getForeignData(
$foreigners, $column['Field'], false, '', ''
);
$html_output .= PMA_getNullColumn(
$column, $column_name_appendix, $real_null_value,
$tabindex, $tabindex_for_null, $idindex, $vkey, $foreigners,

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

@ -557,7 +557,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()
)
);
@ -566,7 +566,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()
)
);
@ -575,7 +575,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()
)
);
@ -584,7 +584,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()
)
);
@ -592,7 +592,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()
)
);
@ -601,7 +601,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()
)
);
@ -610,7 +610,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()
)
);
}