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

Bug #728813

Browse Source
This commit is contained in:
Garvin Hicking
2003-05-02 11:52:11 +00:00
parent 4ebeb6822f
commit 40cbb52b7f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -12,6 +12,8 @@ $Source$
thanks to Ryan)
* Added scripts/inno2pma (from Ernie Hershey). Please see
Patch Tracker #709383 for further information.
* libraries/display_tbl.lib.php3: Bug #728813 (title for
relations when foreign_db != master_db)
2003-04-30 Marc Delisle <lem9@users.sourceforge.net>
* pdf_schema.php3, bug 729517, better comment output,

7
libraries/display_tbl.lib.php3
View File

@@ -1108,6 +1108,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
// n u m e r i c
if ($meta->numeric == 1) {
// lem9: if two fields have the same name (this is possible
// with self-join queries, for example), using $meta->name
@@ -1141,7 +1142,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
// Field to display from the foreign table?
if (!empty($map[$meta->name][2])) {
$dispsql = 'SELECT ' . PMA_backquote($map[$meta->name][2])
. ' FROM ' . PMA_backquote($map[$meta->name][0])
. ' FROM ' . PMA_backquote($map[$meta->name][3]) . '.' . PMA_backquote($map[$meta->name][0])
. ' WHERE ' . PMA_backquote($map[$meta->name][1])
. ' = ' . $row[$pointer];
$dispresult = PMA_mysql_query($dispsql);
@@ -1268,7 +1269,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
// Field to display from the foreign table?
if (!empty($map[$meta->name][2])) {
$dispsql = 'SELECT ' . PMA_backquote($map[$meta->name][2])
. ' FROM ' . PMA_backquote($map[$meta->name][0])
. ' FROM ' . PMA_backquote($map[$meta->name][3]) . '.' . PMA_backquote($map[$meta->name][0])
. ' WHERE ' . PMA_backquote($map[$meta->name][1])
. ' = \'' . PMA_sqlAddslashes($row[$pointer]) . '\'';
$dispresult = @PMA_mysql_query($dispsql);
@@ -1628,7 +1629,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
while ($rel = PMA_mysql_fetch_row($result)) {
// check for display field?
if ($cfgRelation['displaywork']) {
$display_field = PMA_getDisplayField($db, $rel[2]);
$display_field = PMA_getDisplayField($rel[1], $rel[2]);
$map[$rel[0]] = array($rel[2], $rel[3], $display_field, $rel[1]);
} // end if
} // end while