summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsystem/core/Output.php2
-rw-r--r--user_guide_src/source/libraries/output.rst4
2 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index ea39b0223..09d74f0c0 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -229,7 +229,7 @@ class CI_Output {
*
* @return string
*/
- public function get_current_content_type()
+ public function get_content_type()
{
foreach ($this->headers as $header)
{
diff --git a/user_guide_src/source/libraries/output.rst b/user_guide_src/source/libraries/output.rst
index ba1ef19e6..7fd2a1c72 100644
--- a/user_guide_src/source/libraries/output.rst
+++ b/user_guide_src/source/libraries/output.rst
@@ -49,12 +49,12 @@ data, JPEG's, XML, etc easily.
.. important:: Make sure any non-mime string you pass to this method
exists in config/mimes.php or it will have no effect.
-$this->output->get_current_content_type();
+$this->output->get_content_type();
==========================================
Get the current mime-type of your page and return 'text/html' by default.
- $this->output->get_current_content_type();
+ $this->output->get_content_type();
$this->output->get_output();
=============================