did not recognize hard coded & when ; is set as url separator in php
This commit is contained in:
@@ -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
|
||||
|
@@ -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) {
|
||||
|
Reference in New Issue
Block a user