webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity

Merge branch 'QA_4_1'

Browse Source
This commit is contained in:
Atul Pratap Singh
2013-12-29 00:59:23 +05:30
parent 7c7b4d83ea 7974d7d894
commit 96f0f448e4
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -18,6 +18,8 @@ phpMyAdmin - ChangeLog
- bug #4201 Exports are not compressed
- bug #4131 Import: "number of rows to skip" is ambiguous
- bug #4205 Add a user shows additional "edit user group" link
- bug #4202 Cannot read property 'token' of undefined
- bug #4203 On refreshing designer, $.FullScreen is undefined
4.1.2.0 (2013-12-23)
- bug #4178 Quick edit for BIT type does not work

2
js/pmd/iecanvas.js
View File

@@ -7,7 +7,7 @@
/**
*
*/
if (!window.all) { // if IE
if (document.all) { // if IE
document.attachEvent(
"onreadystatechange", // document load
function () {

2
pmd_general.php
View File

@@ -30,12 +30,12 @@ $response->getFooter()->setMinimal();
$header = $response->getHeader();
$header->setBodyId('pmd_body');
$scripts = $header->getScripts();
$scripts->addFile('jquery/jquery.fullscreen.js');
$scripts->addFile('pmd/ajax.js');
$scripts->addFile('pmd/history.js');
$scripts->addFile('pmd/move.js');
$scripts->addFile('pmd/iecanvas.js', true);
$scripts->addFile('pmd/init.js');
$scripts->addFile('jquery/jquery.fullscreen.js');
require 'libraries/db_common.inc.php';
require 'libraries/db_info.inc.php';