diff options
| author | Phil Sturgeon <me@philsturgeon.com> | 2021-11-17 17:29:32 +0100 |
|---|---|---|
| committer | Phil Sturgeon <me@philsturgeon.com> | 2021-11-17 17:29:32 +0100 |
| commit | 47c6b45f524f826e56aff8e77bf289bcbfa1b51d (patch) | |
| tree | e2533dc0e74d62480b52550a13385168aa9f1992 /system/core | |
| parent | d49ffb0cbbb19b552bf8f33cbfe9e52505eae21e (diff) | |
| parent | 5ad670dea78cc0f0c0fd690220a243a905cb06bf (diff) | |
Merge branch 'php80-patch1' of https://github.com/sapics/CodeIgniter into ci3-php8
Diffstat (limited to 'system/core')
| -rw-r--r-- | system/core/Output.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/system/core/Output.php b/system/core/Output.php index a2397763d..bbad9f168 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -305,7 +305,6 @@ class CI_Output { return array_shift($headers); }, $this->headers); - // Combine headers already sent with our batched headers $headers = array_merge( $header_lines, headers_list() |