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

backported bugfix for bug #1541147

Browse Source
This commit is contained in:
Sebastian Mendel
2007-03-06 12:38:47 +00:00
parent 71f554728e
commit 9332d989ac
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@@ -5,15 +5,13 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$HeadURL$ $HeadURL$
2.10.1 2.10.1.0 (not released yet)
====== =====================
- bug #1541147 [js] '#' in database names not correctly handled by queywindow.js
- bug #1671403 [parser] using "client" as table name - bug #1671403 [parser] using "client" as table name
- bug #1672379 [core] Call to undefined function PMA_removeCookie()
2007-03-02 Marc Delisle <lem9@users.sourceforge.net> . [general] use PMA_getenv('PHP_SELF')
* server_status.php: use PMA_getenv('PHP_SELF'), thanks to Sebastian
2007-03-02 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/common.lib.php: bug #1672379 Call to undefined function PMA_removeCookie()
2007-03-01 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2007-03-01 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/common.lib.php: bug #1671813 CVE-2006-1549 deep recursion crash * libraries/common.lib.php: bug #1671813 CVE-2006-1549 deep recursion crash
@@ -126,9 +124,6 @@ $HeadURL$
thanks to Ivan Kirillov thanks to Ivan Kirillov
### 2.10.0-beta1 released from QA_2_10 ### 2.10.0-beta1 released from QA_2_10
2007-01-29 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* js/querywindow.js: fixed bug #1541147 - # in database names
2007-01-26 Michal Čihař <michal@cihar.com> 2007-01-26 Michal Čihař <michal@cihar.com>
* libraries/common.lib.php, libraries/js_escape.lib.php, * libraries/common.lib.php, libraries/js_escape.lib.php,
test/escape_js_string.php, test/core.lib.php: Move java script escaping test/escape_js_string.php, test/core.lib.php: Move java script escaping

22
js/querywindow.js
View File

@@ -71,20 +71,20 @@ function refreshMain(url) {
url = 'main.php'; url = 'main.php';
} }
} }
goTo( url + '?server=' + server + goTo(url + '?server=' + encodeURIComponent(server) +
'&db=' + db + '&db=' + encodeURIComponent(db) +
'&table=' + table + '&table=' + encodeURIComponent(table) +
'&lang=' + lang + '&lang=' + encodeURIComponent(lang) +
'&collation_connection=' + collation_connection, '&collation_connection=' + encodeURIComponent(collation_connection),
'main' ); 'main' );
} }
function refreshNavigation() { function refreshNavigation() {
goTo('navigation.php?server=' + server + goTo('navigation.php?server=' + encodeURIComponent(server) +
'&db=' + db + '&db=' + encodeURIComponent(db) +
'&table=' + table + '&table=' + encodeURIComponent(table) +
'&lang=' + lang + '&lang=' + encodeURIComponent(lang) +
'&collation_connection=' + collation_connection '&collation_connection=' + encodeURIComponent(collation_connection)
); );
} }
@@ -247,7 +247,7 @@ function insertQuery() {
function open_querywindow( url ) { function open_querywindow( url ) {
if ( ! url ) { if ( ! url ) {
url = 'querywindow.php?' + common_query + '&db=' + db + '&table=' + table; url = 'querywindow.php?' + encodeURIComponent(common_query) + '&db=' + encodeURIComponent(db) + '&table=' + encodeURIComponent(table);
} }
if (!querywindow.closed && querywindow.location) { if (!querywindow.closed && querywindow.location) {