Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshutosh Dhundhara <ashutoshdhundhara@yahoo.com>2014-07-31 19:22:39 +0400
committerAshutosh Dhundhara <ashutoshdhundhara@yahoo.com>2014-08-01 18:20:12 +0400
commit508f0a752b372539dd8dd2e045988a292c75e15d (patch)
tree607c979fba741099ca3cfd6c49a56fd49e7c31a1 /db_datadict.php
parent549f0c3214a92674e1188c337b025f399fdffd84 (diff)
RFE#919: Multiple-column foreign key relation.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Fix missing master column. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Fix failing test. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Fix coding styles. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Fix function doc. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Fix coding styles. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
Diffstat (limited to 'db_datadict.php')
-rw-r--r--db_datadict.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/db_datadict.php b/db_datadict.php
index 43d4c154c7..bb0f4eba0a 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -213,11 +213,11 @@ foreach ($tables as $table) {
if ($have_rel) {
echo ' <td>';
- if (isset($res_rel[$column_name])) {
+ if ($foreigner = PMA_searchColumnInForeigners($res_rel, $column_name)) {
echo htmlspecialchars(
- $res_rel[$column_name]['foreign_table']
+ $foreigner['foreign_table']
. ' -> '
- . $res_rel[$column_name]['foreign_field']
+ . $foreigner['foreign_field']
);
}
echo '</td>' . "\n";