Merge #15666 - Remove extra line break from downloaded blob content

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Dec 30, 2019 · 2e624d9 · 2e624d9
2 parents 0fac6a1 + e1b1f15
commit 2e624d9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
@@ -402,8 +402,8 @@ public function enablePrintView(): void
      */
     public function getDisplay(): string
     {
-        if (! $this->_headerIsSent) {
-            if (! $this->_isAjax && $this->_isEnabled) {
+        if (! $this->_headerIsSent && $this->_isEnabled) {
+            if (! $this->_isAjax) {
                 $this->sendHttpHeaders();
 
                 $baseDir = defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : '';
@@ -452,7 +452,7 @@ public function getDisplay(): string
                 $console = $this->_console->getDisplay();
                 $messages = $this->getMessage();
             }
-            if ($this->_isEnabled && empty($_REQUEST['recent_table'])) {
+            if (empty($_REQUEST['recent_table'])) {
                 $recentTable = $this->_addRecentTable(
                     $GLOBALS['db'],
                     $GLOBALS['table']

diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php
@@ -59,7 +59,21 @@ public function testDisable()
         $header = new Header();
         $header->disable();
         $this->assertEquals(
-            "\n",
+            '',
+            $header->getDisplay()
+        );
+    }
+
+    /**
+     * Test for enable
+     *
+     * @return void
+     */
+    public function testEnable()
+    {
+        $header = new Header();
+        $this->assertStringContainsString(
+            '<title>phpMyAdmin</title>',
             $header->getDisplay()
         );
     }