Merge branch 'QA_5_2'

williamdes · williamdes · commit 1f47fc6da8db · 2024-04-28T17:35:22.000+02:00
diff --git a/ChangeLog b/ChangeLog
@@ -94,6 +94,7 @@ phpMyAdmin - ChangeLog
 - issue #19125 Fixed CodeMirror tooltip is below modals
 - issue #18674 Fix formatted sql in browse table result has a linebreak after each token
 - issue #18210 Fixed add replica replication user on MariaDB doesn't work (SQL syntax)
+- issue #19041 Fix footer.twig gets printed to Binary File Download
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid
diff --git a/src/Controllers/Transformation/WrapperController.php b/src/Controllers/Transformation/WrapperController.php
@@ -107,6 +107,8 @@ public function __invoke(ServerRequest $request): Response|null
             }
         }
 
+        // Disabling standard response, we are sending binary here
+        $this->response->disable();
         $this->response->getHeader()->sendHttpHeaders();
 
         /** @psalm-suppress MixedAssignment */

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,8 @@ public function __invoke(ServerRequest $request): Response\|null`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
	`110`	`+ // Disabling standard response, we are sending binary here`
	`111`	`+ $this->response->disable();`
`110`	`112`	`$this->response->getHeader()->sendHttpHeaders();`
`111`	`113`
`112`	`114`	`/** @psalm-suppress MixedAssignment */`