From f370b425f4ee9cbb742f4055fd1dd68ed972d8ab Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sun, 29 Dec 2013 00:45:17 +0530 Subject: [PATCH 1/2] Fix bug#4203 on refreshing designer, FullScreen is undefined Signed-off-by: Atul Pratap Singh --- js/pmd/iecanvas.js | 2 +- pmd_general.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/pmd/iecanvas.js b/js/pmd/iecanvas.js index e2b8e81d06..bc68ec659c 100644 --- a/js/pmd/iecanvas.js +++ b/js/pmd/iecanvas.js @@ -7,7 +7,7 @@ /** * */ -if (!window.all) { // if IE +if (document.all) { // if IE document.attachEvent( "onreadystatechange", // document load function () { diff --git a/pmd_general.php b/pmd_general.php index 29c24836e6..ad66cfc015 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -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'; From 7974d7d8942004bfe2fbb52132e60a07cf707307 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sun, 29 Dec 2013 00:47:31 +0530 Subject: [PATCH 2/2] Changelog for bug#4202 and #4203 Signed-off-by: Atul Pratap Singh --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2c30631ce2..c6ab5e03e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,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