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

bug #2356433 [display] HeaderFlipType "fake" problems

Browse Source
This commit is contained in:
Marc Delisle
2008-11-28 18:23:56 +00:00
parent 1695469dc5
commit 773c5b184c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -15,6 +15,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #2355753 [core] do not bail out creating session on any PHP warning - bug #2355753 [core] do not bail out creating session on any PHP warning
- bug #2355925 [display] properly update tooltips in navigation frame - bug #2355925 [display] properly update tooltips in navigation frame
- bug #2355923 [core] do not use ctype if it is not available - bug #2355923 [core] do not use ctype if it is not available
- bug #2356433 [display] HeaderFlipType "fake" problems,
thanks to Michal Biniek
3.1.0.0 (2008-11-28) 3.1.0.0 (2008-11-28)
+ [auth] Support for Swekey hardware authentication, + [auth] Support for Swekey hardware authentication,

11
libraries/common.lib.php
View File

@@ -1795,19 +1795,19 @@ function PMA_flipstring($string, $Separator = "<br />\n")
if ($char == '&') { if ($char == '&') {
$format_string .= $charbuff; $format_string .= $charbuff;
$charbuff = $char; $charbuff = $char;
$append = true;
} elseif (!empty($charbuff)) {
$charbuff .= $char;
} elseif ($char == ';' && !empty($charbuff)) { } elseif ($char == ';' && !empty($charbuff)) {
$format_string .= $charbuff; $format_string .= $charbuff . $char;
$charbuff = false; $charbuff = false;
$append = true; $append = true;
} elseif (! empty($charbuff)) {
$charbuff .= $char;
} else { } else {
$format_string .= $char; $format_string .= $char;
$append = true; $append = true;
} }
if ($append && ($i != strlen($string))) { // do not add separator after the last character
if ($append && ($i != strlen($string)-1)) {
$format_string .= $Separator; $format_string .= $Separator;
} }
} }
@@ -1815,7 +1815,6 @@ function PMA_flipstring($string, $Separator = "<br />\n")
return $format_string; return $format_string;
} }
/** /**
* Function added to avoid path disclosures. * Function added to avoid path disclosures.
* Called by each script that needs parameters, it displays * Called by each script that needs parameters, it displays