diff options
| author | Kasun Chathuranga <chathuranga.jayaneththi@gmail.com> | 2013-04-30 23:21:15 +0400 |
|---|---|---|
| committer | Kasun Chathuranga <chathuranga.jayaneththi@gmail.com> | 2013-04-30 23:21:15 +0400 |
| commit | 6b1f6ae04630b1dcf4a7c283a1cc3823307279f2 (patch) | |
| tree | 11e9483d97ae6438381d993307cbd9d9e2929432 /tbl_relation.php | |
| parent | 77bb53dcf898a5376c1d3c5e87671a7975091379 (diff) | |
| parent | f78cda80cdfe5b6e945016fcd3efe6df0386c725 (diff) | |
Merge branch 'master' into DBI_naming_cleanUp
Conflicts:
libraries/database_interface.lib.php
libraries/db_table_exists.lib.php
libraries/relation.lib.php
libraries/rte/rte_triggers.lib.php
libraries/schema/Dia_Relation_Schema.class.php
libraries/schema/Visio_Relation_Schema.class.php
tbl_addfield.php
Diffstat (limited to 'tbl_relation.php')
| -rw-r--r-- | tbl_relation.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tbl_relation.php b/tbl_relation.php index 21ec7284ea..48e4132d43 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -541,11 +541,11 @@ if (count($columns) > 0) { // Get "display_field" infos $disp = PMA_getDisplayField($db, $table); $html_output .= '<fieldset>' - . '<label>' . __('Choose column to display') . ': </label>' + . '<label>' . __('Choose column to display:') . '</label>' . '<select name="display_field">' . '<option value="">---</option>'; - foreach ($save_row AS $row) { + foreach ($save_row as $row) { $html_output .= '<option value="' . htmlspecialchars($row['Field']) . '"'; if (isset($disp) && $row['Field'] == $disp) { |