From e0794806726f7c1be611450beba85f062af80bfc Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 28 Nov 2008 18:23:56 +0000
Subject: [PATCH] bug #2356433 [display] HeaderFlipType "fake" problems

---
 ChangeLog                |  2 ++
 libraries/common.lib.php | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d68038e2..4e2dc5964 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,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 #2355925 [display] properly update tooltips in navigation frame
 - bug #2355923 [core] do not use ctype if it is not available
+- bug #2356433 [display] HeaderFlipType "fake" problems,
+  thanks to Michal Binied
 
 3.1.0.0 (2008-11-28)
 + [auth] Support for Swekey hardware authentication,
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index b38d0d69c..7cca4bdbd 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1796,19 +1796,19 @@ function PMA_flipstring($string, $Separator = "<br />\n")
         if ($char == '&') {
             $format_string .= $charbuff;
             $charbuff = $char;
-            $append = true;
-        } elseif (!empty($charbuff)) {
-            $charbuff .= $char;
         } elseif ($char == ';' && !empty($charbuff)) {
-            $format_string .= $charbuff;
+            $format_string .= $charbuff . $char;
             $charbuff = false;
             $append = true;
+        } elseif (! empty($charbuff)) {
+            $charbuff .= $char;
         } else {
             $format_string .= $char;
             $append = true;
         }
 
-        if ($append && ($i != strlen($string))) {
+        // do not add separator after the last character
+        if ($append && ($i != strlen($string)-1)) {
             $format_string .= $Separator;
         }
     }