From cedc7a442c7a636ec7caad62f0d3cc177b5bc365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 5 Jan 2016 08:35:57 +0100
Subject: [PATCH] Fix hiding of page content behind menu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We use jQuery to to the initializaton rather than directly overwriting
onload, which breaks other things,

Fixes #11820, #11812

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                      | 1 +
 js/cross_framing_protection.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1cd8fac5c9..40ba51c9c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog
 - issue #11810 'Add to central columns' (per column button) does nothing
 - issue #11727 SQL duplicate entry error trying to INSERT in designer_settings table
 - issue #11798 Fix handling of databases with dot in a name
+- issue #11820 Fix hiding of page content behind menu
 
 4.5.3.1 (2015-12-25)
 - issue #11774 Undefined offset 2
diff --git a/js/cross_framing_protection.js b/js/cross_framing_protection.js
index 49013f65c9..70e298b9ac 100644
--- a/js/cross_framing_protection.js
+++ b/js/cross_framing_protection.js
@@ -2,7 +2,7 @@
 /**
  * Conditionally included if framing is not allowed
  */
-window.onload = function () {
+$(function () {
     if (self == top) {
         var style_element = document.getElementById("cfs-style");
         // check if style_element has already been removed
@@ -13,4 +13,4 @@ window.onload = function () {
     } else {
         top.location = self.location;
     }
-}
+});