From 1a23eccd2bb19fc74cd575c2ecf5fa163833df9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 4 Oct 2016 11:59:06 +0200 Subject: [PATCH] Remove code for MSIE 6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/Config.php | 11 ++--------- test/classes/ConfigTest.php | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/libraries/Config.php b/libraries/Config.php index 8eb40df7ac..1821191f30 100644 --- a/libraries/Config.php +++ b/libraries/Config.php @@ -135,16 +135,9 @@ class Config $this->set('OBGzip', false); } - // disable output-buffering (if set to 'auto') for IE6, else enable it. + // enable output-buffering (if set to 'auto') if (strtolower($this->get('OBGzip')) == 'auto') { - if ($this->get('PMA_USR_BROWSER_AGENT') == 'IE' - && $this->get('PMA_USR_BROWSER_VER') >= 6 - && $this->get('PMA_USR_BROWSER_VER') < 7 - ) { - $this->set('OBGzip', false); - } else { - $this->set('OBGzip', true); - } + $this->set('OBGzip', true); } } diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php index 6454ed0756..c24671792c 100644 --- a/test/classes/ConfigTest.php +++ b/test/classes/ConfigTest.php @@ -162,7 +162,7 @@ class ConfigTest extends PMATestCase $this->object->set('PMA_USR_BROWSER_AGENT', 'IE'); $this->object->set('PMA_USR_BROWSER_VER', 6); $this->object->checkOutputCompression(); - $this->assertFalse($this->object->get("OBGzip")); + $this->assertTrue($this->object->get("OBGzip")); $this->object->set('OBGzip', 'auto'); $this->object->set('PMA_USR_BROWSER_AGENT', 'MOZILLA');