Some improvements to the additions from pull #1234
diff --git a/system/core/Output.php b/system/core/Output.php
index 09d74f0..01fd1d8 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -220,24 +220,24 @@
$this->headers[] = array($header, TRUE);
return $this;
}
-
+
// --------------------------------------------------------------------
-
+
/**
* Get Current Content Type Header
- * Return text/html if Content-Type is not set
*
- * @return string
+ * @return string 'text/html', if not already set
*/
public function get_content_type()
{
- foreach ($this->headers as $header)
+ for ($i = 0, $c = count($this->headers); $i < $c; $i++)
{
- if (preg_match('/^Content-Type/', $header[0]))
+ if (preg_match('/^Content-Type:\s(.+)$/', $this->headers[$i][0], $matches))
{
- return str_replace('Content-Type: ', '', $header[0]);
+ return $matches[1];
}
}
+
return 'text/html';
}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 770d68a..c3e0e1d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -129,8 +129,8 @@
- Added method() to CI_Input to retrieve $_SERVER['REQUEST_METHOD'].
- Modified valid_ip() to use PHP's filter_var() in the :doc:`Input Library <libraries/input>`.
- Added support for HTTP-Only cookies with new config option ``cookie_httponly`` (default FALSE).
- - Renamed method _call_hook() to call_hook() in the :doc:`Hooks Library <general/hooks.html>`.
- - Added get_content_type for get current mime-types :doc:`Core Output Library <core/output>`.
+ - Renamed method _call_hook() to call_hook() in the :doc:`Hooks Library <general/hooks>`.
+ - Added get_content_type() method to the :doc:`Output Library <libraries/output>`.
Bug fixes for 3.0
------------------
diff --git a/user_guide_src/source/libraries/output.rst b/user_guide_src/source/libraries/output.rst
index 7fd2a1c..baceaae 100644
--- a/user_guide_src/source/libraries/output.rst
+++ b/user_guide_src/source/libraries/output.rst
@@ -52,9 +52,11 @@
$this->output->get_content_type();
==========================================
-Get the current mime-type of your page and return 'text/html' by default.
+Returns the Content-Type HTTP header that's currently in use.
- $this->output->get_content_type();
+ $mime = $this->output->get_content_type();
+
+.. note:: If not set, the default return value is 'text/html'.
$this->output->get_output();
=============================