Merge branch 'working'

32 files changed, 2 insertions, 2 deletions

diff --git a/system/libraries/Cache/Cache.php b/system/libraries/Cache/Cache.php
index 261fc367b..261fc367b 100755..100644
--- a/system/libraries/Cache/Cache.php
+++ b/system/libraries/Cache/Cache.php
diff --git a/system/libraries/Cache/drivers/Cache_apc.php b/system/libraries/Cache/drivers/Cache_apc.php
index f750e6cb7..f750e6cb7 100755..100644
--- a/system/libraries/Cache/drivers/Cache_apc.php
+++ b/system/libraries/Cache/drivers/Cache_apc.php
diff --git a/system/libraries/Cache/drivers/Cache_dummy.php b/system/libraries/Cache/drivers/Cache_dummy.php
index b11b5b8fc..b11b5b8fc 100755..100644
--- a/system/libraries/Cache/drivers/Cache_dummy.php
+++ b/system/libraries/Cache/drivers/Cache_dummy.php
diff --git a/system/libraries/Cache/drivers/Cache_file.php b/system/libraries/Cache/drivers/Cache_file.php
index e515eebf1..e515eebf1 100755..100644
--- a/system/libraries/Cache/drivers/Cache_file.php
+++ b/system/libraries/Cache/drivers/Cache_file.php
diff --git a/system/libraries/Cache/drivers/Cache_memcached.php b/system/libraries/Cache/drivers/Cache_memcached.php
index 747842091..747842091 100755..100644
--- a/system/libraries/Cache/drivers/Cache_memcached.php
+++ b/system/libraries/Cache/drivers/Cache_memcached.php
diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php
index df0fd6eeb..df0fd6eeb 100755..100644
--- a/system/libraries/Calendar.php
+++ b/system/libraries/Calendar.php
diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php
index da47b5a19..da47b5a19 100755..100644
--- a/system/libraries/Cart.php
+++ b/system/libraries/Cart.php
diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php
index 4912c4aa7..4912c4aa7 100755..100644
--- a/system/libraries/Driver.php
+++ b/system/libraries/Driver.php
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 9ec40af9d..d01d5c197 100755..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/Encrypt.php b/system/libraries/Encrypt.php
index b30a8cf0b..b30a8cf0b 100755..100644
--- a/system/libraries/Encrypt.php
+++ b/system/libraries/Encrypt.php
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index 9aab5da4b..9aab5da4b 100755..100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php
index d7a8b3b02..d7a8b3b02 100755..100644
--- a/system/libraries/Ftp.php
+++ b/system/libraries/Ftp.php
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index 21ec2cb4b..21ec2cb4b 100755..100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php
index 34e0d7001..34e0d7001 100755..100644
--- a/system/libraries/Javascript.php
+++ b/system/libraries/Javascript.php
diff --git a/system/libraries/Log.php b/system/libraries/Log.php
index 9f1db76ba..9f1db76ba 100755..100644
--- a/system/libraries/Log.php
+++ b/system/libraries/Log.php
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;
 		}
 
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index cdaacf2d4..cdaacf2d4 100755..100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php
index d223da020..d223da020 100755..100644
--- a/system/libraries/Parser.php
+++ b/system/libraries/Parser.php
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index 882a82c1f..882a82c1f 100755..100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
diff --git a/system/libraries/Session.php b/system/libraries/Session.php
index 891fdd36a..891fdd36a 100755..100644
--- a/system/libraries/Session.php
+++ b/system/libraries/Session.php
diff --git a/system/libraries/Sha1.php b/system/libraries/Sha1.php
index 1a657572b..1a657572b 100755..100644
--- a/system/libraries/Sha1.php
+++ b/system/libraries/Sha1.php
diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index def696776..def696776 100755..100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php
index b0a767822..b0a767822 100755..100644
--- a/system/libraries/Trackback.php
+++ b/system/libraries/Trackback.php
diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php
index 734cec104..734cec104 100755..100644
--- a/system/libraries/Typography.php
+++ b/system/libraries/Typography.php
diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php
index 5bd7e801a..5bd7e801a 100755..100644
--- a/system/libraries/Unit_test.php
+++ b/system/libraries/Unit_test.php
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 0e5d73b19..0e5d73b19 100755..100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index 0b77a7d42..0b77a7d42 100755..100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
index d702e902f..d702e902f 100755..100644
--- a/system/libraries/Xmlrpc.php
+++ b/system/libraries/Xmlrpc.php
diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php
index 9cd332147..9cd332147 100755..100644
--- a/system/libraries/Xmlrpcs.php
+++ b/system/libraries/Xmlrpcs.php
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 666327d5c..666327d5c 100755..100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
diff --git a/system/libraries/index.html b/system/libraries/index.html
index c942a79ce..c942a79ce 100755..100644
--- a/system/libraries/index.html
+++ b/system/libraries/index.html
diff --git a/system/libraries/javascript/Jquery.php b/system/libraries/javascript/Jquery.php
index baab83d25..baab83d25 100755..100644
--- a/system/libraries/javascript/Jquery.php
+++ b/system/libraries/javascript/Jquery.php