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

did not recognize hard coded & when ; is set as url separator in php

Browse Source
This commit is contained in:
Sebastian Mendel
2006-06-20 15:30:59 +00:00
parent 1f7dc05c30
commit 1e1499eef2
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -7,6 +7,8 @@ $Source$
2006-06-20 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2006-06-20 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* themes/*/css/theme_right.css.php: bug #1449845 Nowrap in character sets * 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> 2006-06-15 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sql_query_form.lib.php: Delimiter only if MySQL supports it * libraries/sql_query_form.lib.php: Delimiter only if MySQL supports it

12
libraries/common.lib.php
View File

@@ -126,7 +126,7 @@ function PMA_getDbList()
// use strpos instead of strrpos; it seems more common to // use strpos instead of strrpos; it seems more common to
// have the db name, the separator, then the rest which // have the db name, the separator, then the rest which
// might contain a separator // might contain a separator
// like dbname_the_rest // like dbname_the_rest
$pos = strpos($db, $GLOBALS['cfg']['LeftFrameDBSeparator']); $pos = strpos($db, $GLOBALS['cfg']['LeftFrameDBSeparator']);
$group = substr($db, 0, $pos); $group = substr($db, 0, $pos);
$disp_name_cut = substr($db, $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'])) { if (empty($tag_params['class'])) {
$tag_params['class'] = 'link'; $tag_params['class'] = 'link';
} }
// decode encoded url separators
$separator = PMA_get_arg_separator(); $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); $url = str_replace(htmlentities($separator), $separator, $url);
// end decode
$url_parts = parse_url($url); $url_parts = parse_url($url);
$query_parts = explode($separator, $url_parts['query']); $query_parts = explode($separator, $url_parts['query']);
if ($new_form) { if ($new_form) {