Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-01-06 15:25:36 +01:00
commit d37befb45b
3 changed files with 4 additions and 1 deletions

View File

@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog
- bug #3885 Additional fix for this bug
- bug #4212 Table "disappears" if it has the same name as its tablegroup
- bug #4213 Datetime Quick Edit decrements by one day
- bug #4217 Current value not highlighted when browsing foreign values
4.1.3.0 (2013-12-31)
- bug #3938 PDFDefaultPageSize doc and easy configurability

View File

@ -14,6 +14,7 @@ require_once 'libraries/browse_foreigners.lib.php';
* Sets globals from $_REQUEST
*/
$request_params = array(
'data',
'field'
);

View File

@ -742,7 +742,8 @@ function PMA_getForeignLink($column, $backup_field, $column_name_appendix,
'db' => $db,
'table' => $table,
'field' => $column['Field'],
'rownumber' => $rownumber
'rownumber' => $rownumber,
'data' => $data
)
) . '">'
. str_replace("'", "\'", $titles['Browse']) . '</a>';