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

Merge branch 'QA_4_5'

Browse Source
This commit is contained in:
Marc Delisle 2015-09-24 09:28:13 -04:00
commit a815444712
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog
- issue #11486 Server variable edition in ANSI_QUOTES sql_mode: losing current value
- issue #11491 Propose table structure broken
- issue #11464 phpMyAdmin suggests upgrading to newer version not usable on that system
- issue #11495 'PMA_Microhistory' is undefined
4.5.0.1 (2015-09-24)
- issue #11492 AUTO_INCREMENT statements are partly missing from exports

2
js/functions.js
View File

@ -2837,7 +2837,7 @@ AJAX.registerOnload('functions.js', function () {
// Redirect to table structure page on creation of new table
var params_12 = 'ajax_request=true&ajax_page_request=true';
if (! (history && history.pushState)) {
params_12 += PMA_Microhistory.menus.getRequestParam();
params_12 += PMA_MicroHistory.menus.getRequestParam();
}
tblStruct_url = 'tbl_structure.php?server=' + data._params.server +
'&db='+ data._params.db + '&token=' + data._params.token +

2
js/server_databases.js
View File

@ -128,7 +128,7 @@ AJAX.registerOnload('server_databases.js', function () {
dbStruct_url = dbStruct_url.replace(/amp;/ig, '');
var params = 'ajax_request=true&ajax_page_request=true';
if (! (history && history.pushState)) {
params += PMA_Microhistory.menus.getRequestParam();
params += PMA_MicroHistory.menus.getRequestParam();
}
$.get(dbStruct_url, params, AJAX.responseHandler);
} else {

6
js/sql.js
View File

@ -396,12 +396,12 @@ AJAX.registerOnload('sql.js', function () {
);
AJAX.handleMenu.replace(data._menu);
} else {
PMA_Microhistory.menus.replace(data._menu);
PMA_Microhistory.menus.add(data._menuHash, data._menu);
PMA_MicroHistory.menus.replace(data._menu);
PMA_MicroHistory.menus.add(data._menuHash, data._menu);
}
} else if (data._menuHash) {
if (! (history && history.pushState)) {
PMA_Microhistory.menus.replace(PMA_Microhistory.menus.get(data._menuHash));
PMA_MicroHistory.menus.replace(PMA_MicroHistory.menus.get(data._menuHash));
}
}

2
libraries/Footer.class.php
View File

@ -323,7 +323,7 @@ class PMA_Footer
$this->_scripts->addCode(
sprintf(
'if (! (history && history.pushState)) '
. 'PMA_Microhistory.primer = {'
. 'PMA_MicroHistory.primer = {'
. ' url: "%s",'
. ' scripts: %s,'
. ' menuHash: "%s"'