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

bug 541440

Browse Source
This commit is contained in:
Marc Delisle
2002-04-09 16:40:28 +00:00
parent 2916b7dfe0
commit 9dba0dd0a7
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2002-04-09 Marc Delisle <lem9@users.sourceforge.net>
* libraries/display_tbl.lib.php3, bug 541440 (Relation feature
and blanks in the key), small modif to the patch thanks to Lo<4C>c
2002-04-08 Marc Delisle <lem9@users.sourceforge.net>
* tbl_select.php3: to gain vertical space, reduce the size of the
select box if the number of fields is < 10

5
libraries/display_tbl.lib.php3
View File

@@ -967,6 +967,9 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
|| (function_exists('is_null') && is_null($row[$pointer]))) {
$vertical_display['data'][$foo][$i] = ' <td valign="top" bgcolor="' . $bgcolor . '"><i>NULL</i></td>' . "\n";
} else if ($row[$pointer] != '') {
// loic1: support blanks in the key
$relation_id = $row[$pointer];
// loic1: Cut text/blob fields even if $cfgShowBlob is true
if (eregi('BLOB', $meta->type)) {
if (strlen($row[$pointer]) > $GLOBALS['cfgLimitChars'] && ($dontlimitchars != 1)) {
@@ -995,7 +998,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
. 'lang=' . $lang . '&amp;server=' . $server
. '&amp;db=' . urlencode($db) . '&amp;table=' . urlencode($map[$meta->name][0])
. '&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 ' . $map[$meta->name][1] . ' = \'' . $row[$pointer] . '\'') . '">'
. '&amp;sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($map[$meta->name][0]) . ' WHERE ' . $map[$meta->name][1] . ' = \'' . addslashes($relation_id) . '\'') . '">'
. $row[$pointer] . '</a>';
} else {
$vertical_display['data'][$foo][$i] .= $row[$pointer];