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

Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2

Browse Source
This commit is contained in:
Weblate 2014-08-26 13:55:01 +02:00
commit 58e4568277
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/tbl_relation.lib.php
View File

@ -159,14 +159,14 @@ function PMA_generateRelationalDropdown(
/**
* Function to get html for the common form
*
* @param string $db current database
* @param string $table current table
* @param array $columns columns
* @param array $cfgRelation configuration relation
* @param string $tbl_storage_engine table storage engine
* @param array $existrel db, table, column
* @param array $existrel_foreign db, table, column
* @param array $options_array options array
* @param string $db current database
* @param string $table current table
* @param array $columns columns
* @param array $cfgRelation configuration relation
* @param string $tbl_storage_engine table storage engine
* @param array|null $existrel db, table, column
* @param array|null $existrel_foreign db, table, column
* @param array $options_array options array
*
* @return string
*/

3
tbl_relation.php
View File

@ -148,7 +148,8 @@ $columns = $GLOBALS['dbi']->getColumns($db, $table);
// common form
$html_output .= PMA_getHtmlForCommonForm(
$db, $table, $columns, $cfgRelation, $tbl_storage_engine, $existrel,
$db, $table, $columns, $cfgRelation, $tbl_storage_engine,
isset($existrel) ? $existrel : null,
isset($existrel_foreign) ? $existrel_foreign : null, $options_array
);