From 6ef498b49946ba74d610b3805fb908b163a7f03a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Tue, 5 Jun 2012 22:01:58 +0300
Subject: Added get_mimes() function to system/core/Commons.php.The MIMEs array
 from config/mimes.php is used by multiple core classes, libraries and helpers
 and each of them has implemented an own way of getting it, which is not
 needed and is hard to maintain. This also fixes issue #1411

---
 system/core/Output.php | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'system/core/Output.php')

diff --git a/system/core/Output.php b/system/core/Output.php
index a9e77cc5f..09656711b 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -64,7 +64,7 @@ class CI_Output {
 	 *
 	 * @var array
 	 */
-	public $mime_types =	array();
+	public $mimes =		array();
 
 	/**
 	 * Determines wether profiler is enabled
@@ -104,14 +104,7 @@ class CI_Output {
 		$this->_zlib_oc = (bool) @ini_get('zlib.output_compression');
 
 		// Get mime types for later
-		if (defined('ENVIRONMENT') && file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
-		{
-			$this->mime_types = include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
-		}
-		else
-		{
-			$this->mime_types = include APPPATH.'config/mimes.php';
-		}
+		$this->mimes =& get_mimes();
 
 		log_message('debug', 'Output Class Initialized');
 	}
@@ -214,9 +207,9 @@ class CI_Output {
 			$extension = ltrim($mime_type, '.');
 
 			// Is this extension supported?
-			if (isset($this->mime_types[$extension]))
+			if (isset($this->mimes[$extension]))
 			{
-				$mime_type =& $this->mime_types[$extension];
+				$mime_type =& $this->mimes[$extension];
 
 				if (is_array($mime_type))
 				{
-- 
cgit v1.2.3-24-g4f1b


From 47b673324f06236264ca64f8c3155aab51762609 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Wed, 6 Jun 2012 15:58:05 +0300
Subject: Add a second parameter (charset) to CI_Output::set_content_type() +
 fix for issue #666

---
 system/core/Output.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'system/core/Output.php')

diff --git a/system/core/Output.php b/system/core/Output.php
index 09656711b..0bf982289 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -200,7 +200,7 @@ class CI_Output {
 	 * @param	string	extension of the file we're outputting
 	 * @return	void
 	 */
-	public function set_content_type($mime_type)
+	public function set_content_type($mime_type, $charset = NULL)
 	{
 		if (strpos($mime_type, '/') === FALSE)
 		{
@@ -218,7 +218,13 @@ class CI_Output {
 			}
 		}
 
-		$header = 'Content-Type: '.$mime_type;
+		if (empty($charset))
+		{
+			$charset = config_item('charset');
+		}
+
+		$header = 'Content-Type: '.$mime_type
+			.(empty($charset) ? NULL : '; charset='.strtolower($charset));
 
 		$this->headers[] = array($header, TRUE);
 		return $this;
-- 
cgit v1.2.3-24-g4f1b


From c839d28f4230dce0c658338f267b821cc16490a2 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Thu, 7 Jun 2012 14:35:27 +0300
Subject: Remove some unnecessary function_exists() checks and some minor
 improvements

---
 system/core/Output.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/core/Output.php')

diff --git a/system/core/Output.php b/system/core/Output.php
index 0bf982289..5588ffe8e 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -370,7 +370,7 @@ class CI_Output {
 
 		if ($this->parse_exec_vars === TRUE)
 		{
-			$memory	= function_exists('memory_get_usage') ? round(memory_get_usage()/1024/1024, 2).'MB' : '0';
+			$memory	= round(memory_get_usage() / 1024 / 1024, 2).'MB';
 
 			$output = str_replace(array('{elapsed_time}', '{memory_usage}'), array($elapsed, $memory), $output);
 		}
-- 
cgit v1.2.3-24-g4f1b


From 0d2c06ea1d96ea3f35dd1e7856977a24cec43233 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Tue, 12 Jun 2012 02:33:45 +0300
Subject: Change file permissions for system/core/*.php and
 system/database/DB.php so that they don't differ from the rest

---
 system/core/Output.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 system/core/Output.php

(limited to 'system/core/Output.php')

diff --git a/system/core/Output.php b/system/core/Output.php
old mode 100755
new mode 100644
-- 
cgit v1.2.3-24-g4f1b