Merge pull request #6074 from philsturgeon/ci3-php8

CodeIgniter 3.0 on PHP 8

1 files changed, 7 insertions, 3 deletions

diff --git a/system/core/Output.php b/system/core/Output.php
index c56aff4b0..bbad9f168 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -299,10 +299,14 @@ class CI_Output {
 	 */
 	public function get_header($header)
 	{
-		// Combine headers already sent with our batched headers
+		// We only need [x][0] from our multi-dimensional array
+		$header_lines = array_map(function ($headers)
+		{
+			return array_shift($headers);
+		}, $this->headers);
+
 		$headers = array_merge(
-			// We only need [x][0] from our multi-dimensional array
-			array_map('array_shift', $this->headers),
+			$header_lines,
 			headers_list()
 		);