From 1e1499eef20c9d5c7025bd01f2655cc318da8774 Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Tue, 20 Jun 2006 15:30:59 +0000
Subject: [PATCH] did not recognize hard coded & when ; is set as url separator
 in php

---
 ChangeLog                |  2 ++
 libraries/common.lib.php | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 13d48d311..6dcc23aa4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ $Source$
 
 2006-06-20 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * themes/*/css/theme_right.css.php: bug #1449845 Nowrap in character sets
+    * libraries/common.lib.php::PMA_linkOrButton():
+      did not recognize hard coded & when ; is set as url separator in php
 
 2006-06-15 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/sql_query_form.lib.php: Delimiter only if MySQL supports it
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 7aa437196..9f3508195 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -126,7 +126,7 @@ function PMA_getDbList()
             // use strpos instead of strrpos; it seems more common to
             // have the db name, the separator, then the rest which
             // might contain a separator
-            // like dbname_the_rest 
+            // like dbname_the_rest
             $pos            = strpos($db, $GLOBALS['cfg']['LeftFrameDBSeparator']);
             $group          = substr($db, 0, $pos);
             $disp_name_cut  = substr($db, $pos);
@@ -2055,8 +2055,18 @@ window.parent.updateTableTitle('<?php echo $uni_tbl; ?>', '<?php echo PMA_jsForm
             if (empty($tag_params['class'])) {
                 $tag_params['class'] = 'link';
             }
+
+            // decode encoded url separators
             $separator   = PMA_get_arg_separator();
+            // on most places separator is still hard coded ...
+            if ($separator !== '&') {
+                // ... so always replace & with $separator
+                $url         = str_replace(htmlentities('&'), $separator, $url);
+                $url         = str_replace('&', $separator, $url);
+            }
             $url         = str_replace(htmlentities($separator), $separator, $url);
+            // end decode
+
             $url_parts   = parse_url($url);
             $query_parts = explode($separator, $url_parts['query']);
             if ($new_form) {