Merge tag '2.1.4'

Signed-off-by: Florian Pritz <bluewind@xinu.at>

Conflicts:
	application/config/migration.php
	user_guide/changelog.html

2 files changed, 2 insertions, 2 deletions

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 9ec40af9d..d01d5c197 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1954,7 +1954,7 @@ class CI_Email {
 			}
 		}
 
-		$msg .= "<pre>".$this->_header_str."\n".htmlspecialchars($this->_subject)."\n".htmlspecialchars($this->_finalbody).'</pre>';
+		$msg .= "<pre>".htmlspecialchars($this->_header_str)."\n".htmlspecialchars($this->_subject)."\n".htmlspecialchars($this->_finalbody).'</pre>';
 		return $msg;
 	}
 
diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php
index df2dd7ce3..ffa640ba6 100644
--- a/system/libraries/Migration.php
+++ b/system/libraries/Migration.php
@@ -220,7 +220,7 @@ class CI_Migration {
 	{
 		if ( ! $migrations = $this->find_migrations())
 		{
-			$this->_error_string = $this->line->lang('migration_none_found');
+			$this->_error_string = $this->lang->line('migration_none_found');
 			return false;
 		}