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

Bug #662320

Browse Source
This commit is contained in:
Garvin Hicking
2003-04-17 15:48:53 +00:00
parent 94fc3097ac
commit b640ff2a96
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -11,6 +11,8 @@ $Source$
* tbl_replace.php3, tbl_replace_fields.php3: Bug #722629 - Use * tbl_replace.php3, tbl_replace_fields.php3: Bug #722629 - Use
original values of a BLOB field when 'Insert as new row' is original values of a BLOB field when 'Insert as new row' is
chosen on edit. chosen on edit.
* libraries/display_tbl.lib.php3: Bug #662320 (highlight fields
crossing DB borders now allowed)
2003-04-16 Garvin Hicking <me@supergarv.de> 2003-04-16 Garvin Hicking <me@supergarv.de>
* tbl_query_box.php3: Only hide 'go' SQL button, when in files mode * tbl_query_box.php3: Only hide 'go' SQL button, when in files mode

6
libraries/display_tbl.lib.php3
View File

@@ -1158,7 +1158,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
$title = (!empty($dispval))? ' title="' . htmlspecialchars($dispval) . '"' : ''; $title = (!empty($dispval))? ' title="' . htmlspecialchars($dispval) . '"' : '';
$vertical_display['data'][$row_no][$i] .= '<a href="sql.php3?' $vertical_display['data'][$row_no][$i] .= '<a href="sql.php3?'
. PMA_generate_common_url($db, $map[$meta->name][0]) . PMA_generate_common_url($map[$meta->name][3], $map[$meta->name][0])
. '&amp;pos=0&amp;session_max_rows=' . $session_max_rows . '&amp;dontlimitchars=' . $dontlimitchars . '&amp;pos=0&amp;session_max_rows=' . $session_max_rows . '&amp;dontlimitchars=' . $dontlimitchars
. '&amp;sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($map[$meta->name][0]) . ' WHERE ' . PMA_backquote($map[$meta->name][1]) . ' = ' . $row[$pointer]) . '"' . $title . '>' . '&amp;sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($map[$meta->name][0]) . ' WHERE ' . PMA_backquote($map[$meta->name][1]) . ' = ' . $row[$pointer]) . '"' . $title . '>'
. ($transform_function != $default_function ? $transform_function($row[$pointer], $transform_options) : $transform_function($row[$pointer])) . '</a>'; . ($transform_function != $default_function ? $transform_function($row[$pointer], $transform_options) : $transform_function($row[$pointer])) . '</a>';
@@ -1285,7 +1285,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
$title = (!empty($dispval))? ' title="' . htmlspecialchars($dispval) . '"' : ''; $title = (!empty($dispval))? ' title="' . htmlspecialchars($dispval) . '"' : '';
$vertical_display['data'][$row_no][$i] .= '<a href="sql.php3?' $vertical_display['data'][$row_no][$i] .= '<a href="sql.php3?'
. PMA_generate_common_url($db, $map[$meta->name][0]) . PMA_generate_common_url($map[$meta->name][3], $map[$meta->name][0])
. '&amp;pos=0&amp;session_max_rows=' . $session_max_rows . '&amp;dontlimitchars=' . $dontlimitchars . '&amp;pos=0&amp;session_max_rows=' . $session_max_rows . '&amp;dontlimitchars=' . $dontlimitchars
. '&amp;sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($map[$meta->name][0]) . ' WHERE ' . PMA_backquote($map[$meta->name][1]) . ' = \'' . PMA_sqlAddslashes($relation_id) . '\'') . '"' . $title . '>' . '&amp;sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($map[$meta->name][0]) . ' WHERE ' . PMA_backquote($map[$meta->name][1]) . ' = \'' . PMA_sqlAddslashes($relation_id) . '\'') . '"' . $title . '>'
. $row[$pointer] . '</a>'; . $row[$pointer] . '</a>';
@@ -1629,7 +1629,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
// check for display field? // check for display field?
if ($cfgRelation['displaywork']) { if ($cfgRelation['displaywork']) {
$display_field = PMA_getDisplayField($db, $rel[2]); $display_field = PMA_getDisplayField($db, $rel[2]);
$map[$rel[0]] = array($rel[2], $rel[3], $display_field); $map[$rel[0]] = array($rel[2], $rel[3], $display_field, $rel[1]);
} // end if } // end if
} // end while } // end while
} // end if } // end if