From 8bcdb30539d226041fbe0f8c7e3c0b5d038edebc Mon Sep 17 00:00:00 2001
From: Michael Brooks <mjbrooks@uw.edu>
Date: Sat, 27 Oct 2012 17:01:47 -0700
Subject: Fix language typo in Migrations library

lang and line were out of order
---
 system/libraries/Migration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries')

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;
 		}
 
-- 
cgit v1.2.3-24-g4f1b


From 4606acc6e1f01ffcdbf740c41f593b3a82d94c1e Mon Sep 17 00:00:00 2001
From: moi90 <martin.schroeder@nerdluecht.de>
Date: Fri, 15 Mar 2013 16:48:56 +0100
Subject: Email library: htmlspecialchars for _header_str

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

(limited to 'system/libraries')

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;
 	}
 
-- 
cgit v1.2.3-24-g4f1b