diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-04-03 19:54:49 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-04-03 19:54:49 +0200 |
commit | fd105ab7f05e64c0d9188e43c6fd6a2bb2c6cf7f (patch) | |
tree | d16dc16ae5e81f6171a18b3278d48038406937bd /system/core/Output.php | |
parent | 5b46f42d654e7474a47ecfd9f7dafece98ee668e (diff) | |
parent | ab1d568b7b7bce779cd00c90cd99c6f43747575b (diff) |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-postgre
Diffstat (limited to 'system/core/Output.php')
-rwxr-xr-x | system/core/Output.php | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/system/core/Output.php b/system/core/Output.php index 9bf818e88..01fd1d867 100755 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -224,6 +224,26 @@ class CI_Output { // -------------------------------------------------------------------- /** + * Get Current Content Type Header + * + * @return string 'text/html', if not already set + */ + public function get_content_type() + { + for ($i = 0, $c = count($this->headers); $i < $c; $i++) + { + if (preg_match('/^Content-Type:\s(.+)$/', $this->headers[$i][0], $matches)) + { + return $matches[1]; + } + } + + return 'text/html'; + } + + // -------------------------------------------------------------------- + + /** * Set HTTP Status Header * moved to Common procedural functions in 1.7.2 * |