summaryrefslogtreecommitdiffstats
path: root/system/core/Output.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2021-12-20 14:47:39 +0100
committerAndrey Andreev <narf@devilix.net>2021-12-20 14:51:13 +0100
commit74384ca7f88913b87e982696bb5cb3eb5593c451 (patch)
tree3a17b60268a1869c6ee42468153a34020c2a11ac /system/core/Output.php
parentd9218efec1d89e9d633b73f367bcc7b676400621 (diff)
Merge pull request #6074 from philsturgeon/ci3-php8
CodeIgniter 3.0 on PHP 8
Diffstat (limited to 'system/core/Output.php')
-rw-r--r--system/core/Output.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index cef092600..93d85e798 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()
);