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

cosmetic change to allow better word wrapping

Browse Source
This commit is contained in:
Loïc Chapeaux
2002-04-11 20:29:44 +00:00
parent 9b2c1f9856
commit 604faaea45
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,9 +5,13 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-04-11 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* libraries/display_tbl.lib.php3, line 957: cosmetic change to allow word
wrapping thanks to Adam Burley <kidburla2002 at users.sourceforge.net>.
2002-04-11 Alexander M. Turek <rabus@users.sourceforge.net> 2002-04-11 Alexander M. Turek <rabus@users.sourceforge.net>
* libraries/display_tbl.lib.php3, line 1293: fixed bug #542524 (Wrong * libraries/display_tbl.lib.php3, line 1293: fixed bug #542524 (Wrong
interval is displayed). Thanks to Matthias Schniedermeyer for his report interval is displayed). Thanks to Matthias Schniedermeyer for his report.
2002-04-11 Marc Delisle <lem9@users.sourceforge.net> 2002-04-11 Marc Delisle <lem9@users.sourceforge.net>
* header.inc.php3, bug #540718, merge css patch thanks to Lo<4C>c * header.inc.php3, bug #540718, merge css patch thanks to Lo<4C>c

4
libraries/display_tbl.lib.php3
View File

@@ -989,7 +989,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
// characters for tabulations and <cr>/<lf> // characters for tabulations and <cr>/<lf>
else { else {
$row[$pointer] = htmlspecialchars($row[$pointer]); $row[$pointer] = htmlspecialchars($row[$pointer]);
$row[$pointer] = str_replace("\011", '&nbsp;&nbsp;&nbsp;&nbsp;', str_replace(' ', '&nbsp;', $row[$pointer])); $row[$pointer] = str_replace("\011", '&nbsp;&nbsp;&nbsp;&nbsp;', str_replace(' ', ' &nbsp;', $row[$pointer]));
$row[$pointer] = ereg_replace("((\015\012)|(\015)|(\012))", '<br />', $row[$pointer]); $row[$pointer] = ereg_replace("((\015\012)|(\015)|(\012))", '<br />', $row[$pointer]);
} }
$vertical_display['data'][$foo][$i] = ' <td valign="top" bgcolor="' . $bgcolor . '">'; $vertical_display['data'][$foo][$i] = ' <td valign="top" bgcolor="' . $bgcolor . '">';
@@ -1289,7 +1289,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
} }
$last_shown_rec = ($GLOBALS['session_max_rows'] == 'all' || $pos_next > $total) $last_shown_rec = ($GLOBALS['session_max_rows'] == 'all' || $pos_next > $total)
? $total ? $total
: $pos_next-1; : $pos_next - 1;
PMA_showMessage($GLOBALS['strShowingRecords'] . " $pos - $last_shown_rec ($total " . $GLOBALS['strTotal'] . $selectstring . ')'); PMA_showMessage($GLOBALS['strShowingRecords'] . " $pos - $last_shown_rec ($total " . $GLOBALS['strTotal'] . $selectstring . ')');
} else { } else {
PMA_showMessage($GLOBALS['strSQLQuery']); PMA_showMessage($GLOBALS['strSQLQuery']);