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

Fix merge conflict

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2014-01-06 20:04:22 -05:00
parent 4c1e377638
commit 0a65267a57
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -24,6 +24,7 @@ phpMyAdmin - ChangeLog
- 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
- bug #4220 Incorrect key values in foreign key browser
4.1.3.0 (2013-12-31)
- bug #3938 PDFDefaultPageSize doc and easy configurability

2
libraries/browse_foreigners.lib.php
View File

@ -180,7 +180,7 @@ function PMA_getHtmlForRelationalFieldSelection($db, $table, $field, $foreignDat
$output .= PMA_getHtmlForColumnElement(
'class="nowrap"', $val_ordered_current_equals_data,
$key_ordered_current_key, $val_ordered_current_val,
$val_ordered_current_key, $val_ordered_current_val,
$val_ordered_current_val_title, $field
);
$output .= '</tr>';