Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-08-26 13:59:16 +02:00
commit 1c3ce48692

View File

@ -166,14 +166,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
*/