Merge branch 'refs/heads/develop' into update/changelog

Conflicts:
	user_guide_src/source/changelog.rst
	user_guide_src/source/installation/downloads.rst
	user_guide_src/source/installation/upgrade_214.rst

6 files changed, 43 insertions, 39 deletions

diff --git a/composer.json b/composer.json
index 29715763f..0f98fe7a0 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,6 @@
 		"php": ">=5.2.4"
 	},
 	"require-dev": {
-		"mikey179/vfsStream": "*"
+		"mikey179/vfsStream": "1.1.*"
 	}
 }
\ No newline at end of file
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 11ee29041..46ffaa1d4 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -2140,7 +2140,7 @@ class CI_Email {
 
 		if (in_array('headers', $include, TRUE))
 		{
-			$raw_data = $this->_header_str."\n";
+			$raw_data = htmlspecialchars($this->_header_str)."\n";
 		}
 
 		if (in_array('subject', $include, TRUE))
diff --git a/tests/mocks/database/db.php b/tests/mocks/database/db.php
index 7e0030e15..968476dea 100644
--- a/tests/mocks/database/db.php
+++ b/tests/mocks/database/db.php
@@ -106,6 +106,7 @@ class Mock_Database_DB {
 		$subdriver = self::$subdriver;
 		$case->ci_vfs_create(array(
 			'DB_driver.php' => '',
+			'DB_result.php' => '',
 			'DB_forge.php' => '',
 			'DB_query_builder.php' => ''
 		), '', $case->ci_base_root, 'database');
@@ -113,6 +114,7 @@ class Mock_Database_DB {
 		{
 			$case->ci_vfs_create(array(
 				$driver.'_driver.php' => '',
+				$driver.'_result.php' => '',
 				$driver.'_forge.php' => ''
 			), '', $case->ci_base_root, 'database/drivers/'.$driver);
 		}
diff --git a/user_guide_src/source/helpers/date_helper.rst b/user_guide_src/source/helpers/date_helper.rst
index 3a3454edc..5dfee8b48 100644
--- a/user_guide_src/source/helpers/date_helper.rst
+++ b/user_guide_src/source/helpers/date_helper.rst
@@ -414,9 +414,9 @@ Note some of the location lists have been abridged for clarity and formatting.
 ===========	=====================================================================
 Time Zone	Location
 ===========	=====================================================================
-UM2		(UTC - 12:00) Baker/Howland Island
-UM1		(UTC - 11:00) Samoa Time Zone, Niue
-UM0		(UTC - 10:00) Hawaii-Aleutian Standard Time, Cook Islands
+UM12		(UTC - 12:00) Baker/Howland Island
+UM11		(UTC - 11:00) Samoa Time Zone, Niue
+UM10		(UTC - 10:00) Hawaii-Aleutian Standard Time, Cook Islands
 UM95		(UTC - 09:30) Marquesas Islands
 UM9		(UTC - 09:00) Alaska Standard Time, Gambier Islands
 UM8		(UTC - 08:00) Pacific Standard Time, Clipperton Island
@@ -428,7 +428,7 @@ UM4		(UTC - 04:00) Atlantic Standard Time, Eastern Caribbean
 UM35		(UTC - 03:30) Newfoundland Standard Time
 UM3		(UTC - 03:00) Argentina, Brazil, French Guiana, Uruguay
 UM2		(UTC - 02:00) South Georgia/South Sandwich Islands
-UM		(UTC -1:00) Azores, Cape Verde Islands
+UM1		(UTC -1:00) Azores, Cape Verde Islands
 UTC		(UTC) Greenwich Mean Time, Western European Time
 UP1		(UTC +1:00) Central European Time, West Africa Time
 UP2		(UTC +2:00) Central Africa Time, Eastern European Time
@@ -452,6 +452,6 @@ UP11		(UTC +11:00) Magadan Time, Solomon Islands, Vanuatu
 UP115		(UTC +11:30) Norfolk Island
 UP12		(UTC +12:00) Fiji, Gilbert Islands, Kamchatka, New Zealand
 UP1275		(UTC +12:45) Chatham Islands Standard Time
-UP1		(UTC +13:00) Phoenix Islands Time, Tonga
+UP13		(UTC +13:00) Phoenix Islands Time, Tonga
 UP14		(UTC +14:00) Line Islands
 ===========	=====================================================================
\ No newline at end of file
diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst
index 8f3965647..d046e7cc6 100644
--- a/user_guide_src/source/installation/downloads.rst
+++ b/user_guide_src/source/installation/downloads.rst
@@ -2,36 +2,37 @@
 Downloading CodeIgniter
 #######################
 
--  `CodeIgniter v3.0.0 (Current version) <http://codeigniter.com/downloads/>`_
--  `CodeIgniter v2.1.4 <http://codeigniter.com/download_files/reactor/CodeIgniter_2.1.4.zip>`_
--  `CodeIgniter v2.1.3 <http://codeigniter.com/download_files/reactor/CodeIgniter_2.1.3.zip>`_
--  `CodeIgniter v2.1.2 <http://codeigniter.com/download_files/reactor/CodeIgniter_2.1.2.zip>`_
--  `CodeIgniter v2.1.1 <http://codeigniter.com/download_files/reactor/CodeIgniter_2.1.1.zip>`_
--  `CodeIgniter v2.1.0 <http://codeigniter.com/download_files/reactor/CodeIgniter_2.1.0.zip>`_
--  `CodeIgniter v2.0.3 <http://codeigniter.com/download_files/reactor/CodeIgniter_2.0.3.zip>`_
--  `CodeIgniter v2.0.2 <http://codeigniter.com/download_files/reactor/CodeIgniter_2.0.2.zip>`_
--  `CodeIgniter v2.0.1 <http://codeigniter.com/download_files/reactor/CodeIgniter_2.0.1.zip>`_
--  `CodeIgniter v2.0.0 <http://codeigniter.com/download_files/reactor/CodeIgniter_2.0.0.zip>`_
--  `CodeIgniter v1.7.3 <http://codeigniter.com/download_files/CodeIgniter_1.7.3.zip>`_
--  `CodeIgniter v1.7.2 <http://codeigniter.com/download_files/CodeIgniter_1.7.2.zip>`_
--  `CodeIgniter v1.7.1 <http://codeigniter.com/download_files/CodeIgniter_1.7.1.zip>`_
--  `CodeIgniter v1.7.0 <http://codeigniter.com/download_files/CodeIgniter_1.7.0.zip>`_
--  `CodeIgniter v1.6.3 <http://codeigniter.com/download_files/CodeIgniter_1.6.3.zip>`_
--  `CodeIgniter v1.6.2 <http://codeigniter.com/download_files/CodeIgniter_1.6.2.zip>`_
--  `CodeIgniter v1.6.1 <http://codeigniter.com/download_files/CodeIgniter_1.6.1.zip>`_
--  `CodeIgniter v1.6.0 <http://codeigniter.com/download_files/CodeIgniter_1.6.0.zip>`_
--  `CodeIgniter v1.5.4 <http://codeigniter.com/download_files/CodeIgniter_1.5.4.zip>`_
--  `CodeIgniter v1.5.3 <http://codeigniter.com/download_files/CodeIgniter_1.5.3.zip>`_
--  `CodeIgniter v1.5.2 <http://codeigniter.com/download_files/CodeIgniter_1.5.2.zip>`_
--  `CodeIgniter v1.5.1 <http://codeigniter.com/download_files/CodeIgniter_1.5.1.zip>`_
--  `CodeIgniter v1.4.1 <http://codeigniter.com/download_files/CodeIgniter_1.4.1.zip>`_
--  `CodeIgniter v1.3.3 <http://codeigniter.com/download_files/CodeIgniter_1.3.3.zip>`_
--  `CodeIgniter v1.3.2 <http://codeigniter.com/download_files/CodeIgniter_1.3.2.zip>`_
--  `CodeIgniter v1.3.1 <http://codeigniter.com/download_files/CodeIgniter_1.3.1.zip>`_
--  `CodeIgniter v1.3 <http://codeigniter.com/download_files/CodeIgniter_1.3.zip>`_
--  `CodeIgniter v1.2 <http://codeigniter.com/download_files/CodeIgniter_1.2.zip>`_
--  `CodeIgniter v1.1 <http://codeigniter.com/download_files/CodeIgniter_1.1b.zip>`_
--  `CodeIgniter v1.0 <http://codeigniter.com/download_files/CodeIgniter_1.0b.zip>`_
+-  `CodeIgniter V 3.0.0 (Current version) <http://ellislab.com/codeigniter/download>`_
+-  `CodeIgniter V 2.1.4 <http://ellislab.com/asset/ci_download_files/CodeIgniter_2.1.4.zip>`_
+-  `CodeIgniter V 2.1.3 <http://ellislab.com/asset/ci_download_files/CodeIgniter_2.1.3.zip>`_
+-  `CodeIgniter V 2.1.2 <http://ellislab.com/asset/ci_download_files/CodeIgniter_2.1.2.zip>`_
+-  `CodeIgniter V 2.1.1 <http://ellislab.com/asset/ci_download_files/CodeIgniter_2.1.1.zip>`_
+-  `CodeIgniter V 2.1.0 <http://ellislab.com/asset/ci_download_files/CodeIgniter_2.1.0.zip>`_
+-  `CodeIgniter V 2.0.3 <http://ellislab.com/asset/ci_download_files/CodeIgniter_2.0.3.zip>`_
+-  `CodeIgniter V 2.0.2 <http://ellislab.com/asset/ci_download_files/CodeIgniter_2.0.2.zip>`_
+-  `CodeIgniter V 2.0.1 <http://ellislab.com/asset/ci_download_files/CodeIgniter_2.0.1.zip>`_
+-  `CodeIgniter V 2.0.0 <http://ellislab.com/asset/ci_download_files/CodeIgniter_2.0.0.zip>`_
+-  `CodeIgniter V 1.7.3 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.7.3.zip>`_
+-  `CodeIgniter V 1.7.2 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.7.2.zip>`_
+-  `CodeIgniter V 1.7.1 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.7.1.zip>`_
+-  `CodeIgniter V 1.7.0 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.7.0.zip>`_
+-  `CodeIgniter V 1.6.3 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.6.3.zip>`_
+-  `CodeIgniter V 1.6.2 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.6.2.zip>`_
+-  `CodeIgniter V 1.6.1 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.6.1.zip>`_
+-  `CodeIgniter V 1.6.0 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.6.0.zip>`_
+-  `CodeIgniter V 1.5.4 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.5.4.zip>`_
+-  `CodeIgniter V 1.5.3 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.5.3.zip>`_
+-  `CodeIgniter V 1.5.2 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.5.2.zip>`_
+-  `CodeIgniter V 1.5.1 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.5.1.zip>`_
+-  `CodeIgniter V 1.4.1 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.4.1.zip>`_
+-  `CodeIgniter V 1.3.3 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.3.3.zip>`_
+-  `CodeIgniter V 1.3.2 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.3.2.zip>`_
+-  `CodeIgniter V 1.3.1 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.3.1.zip>`_
+-  `CodeIgniter V 1.3 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.3.zip>`_
+-  `CodeIgniter V 1.2 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.2.zip>`_
+-  `CodeIgniter V 1.1 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.1b.zip>`_
+-  `CodeIgniter V 1.0 <http://ellislab.com/asset/ci_download_files/CodeIgniter_1.0b.zip>`_
+
 
 ******
 GitHub
@@ -44,4 +45,5 @@ Please note that while every effort is made to keep this code base
 functional, we cannot guarantee the functionality of code taken from
 the develop branch.
 
-Beginning with version 2.0.3, stable releases are also available via GitHub. Simply select the version you want from the `Releases <https://github.com/EllisLab/CodeIgniter/releases>`_ page.
\ No newline at end of file
+Beginning with version 2.0.3, stable tags are also available via GitHub at
+`this link <https://github.com/EllisLab/CodeIgniter/releases>`_.
\ No newline at end of file
diff --git a/user_guide_src/source/installation/upgrade_214.rst b/user_guide_src/source/installation/upgrade_214.rst
index 42dcb5abd..ba57e5976 100644
--- a/user_guide_src/source/installation/upgrade_214.rst
+++ b/user_guide_src/source/installation/upgrade_214.rst
@@ -11,4 +11,4 @@ Step 1: Update your CodeIgniter files
 Replace all files and directories in your "system" folder.
 
 .. note:: If you have any custom developed files in these folders please
-   make copies of them first.
\ No newline at end of file
+	make copies of them first.
\ No newline at end of file