From d52e3b19eb03bcd38f89ccbf5aae68364f715343 Mon Sep 17 00:00:00 2001
From: Sam Li <samxli@yahoo.com>
Date: Mon, 23 Apr 2012 23:04:35 +0800
Subject: Added fix for issue:
 https://github.com/EllisLab/CodeIgniter/issues/1277

---
 system/helpers/download_helper.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'system/helpers/download_helper.php')

diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index 19192a147..18fe96223 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -100,6 +100,9 @@ if ( ! function_exists('force_download'))
 			$x[count($x) - 1] = strtoupper($extension);
 			$filename = implode('.', $x);
 		}
+		
+		//Clean output buffer
+		ob_clean();
 
 		// Generate the server headers
 		header('Content-Type: '.$mime);
-- 
cgit v1.2.3-24-g4f1b


From bbd9dd3df9d373fbac8560db926a9f70a5bde3b7 Mon Sep 17 00:00:00 2001
From: Sam Li <samxli@yahoo.com>
Date: Mon, 23 Apr 2012 23:13:46 +0800
Subject: Tweak to comments to conform to style guide.

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

(limited to 'system/helpers/download_helper.php')

diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index 18fe96223..8b87f8179 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -101,7 +101,7 @@ if ( ! function_exists('force_download'))
 			$filename = implode('.', $x);
 		}
 		
-		//Clean output buffer
+		// Clean output buffer
 		ob_clean();
 
 		// Generate the server headers
-- 
cgit v1.2.3-24-g4f1b


From 01b129a42b62fd08cd873f44ded026041b560420 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Fri, 27 Apr 2012 11:36:50 -0400
Subject: Fix docblocks A-H

---
 system/helpers/download_helper.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'system/helpers/download_helper.php')

diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index 8b87f8179..97e6986b0 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -37,18 +37,18 @@
 
 // ------------------------------------------------------------------------
 
-/**
- * Force Download
- *
- * Generates headers that force a download to happen
- *
- * @param	string	filename
- * @param	mixed	the data to be downloaded
- * @param	bool	wether to try and send the actual file MIME type
- * @return	void
- */
 if ( ! function_exists('force_download'))
 {
+	/**
+	 * Force Download
+	 *
+	 * Generates headers that force a download to happen
+	 *
+	 * @param	string	filename
+	 * @param	mixed	the data to be downloaded
+	 * @param	bool	wether to try and send the actual file MIME type
+	 * @return	void
+	 */
 	function force_download($filename = '', $data = '', $set_mime = FALSE)
 	{
 		if ($filename == '' OR $data == '')
-- 
cgit v1.2.3-24-g4f1b