summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-10 15:07:17 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-10 15:07:17 +0200
commit9f44c21a3c90e984becaea3948ebafe90d89ac56 (patch)
treed3fed2b0b455fc1debfa62d05873b5fe108daed7 /system/libraries
parent6c5f751b5ae66800e7ef3f70306a6bcbcdeeabf1 (diff)
Changelog entry for previous commit and change default charset for the Email library to whatever the config array says
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Email.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 1b457aee4..698cb7679 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -98,6 +98,8 @@ class CI_Email {
*/
public function __construct($config = array())
{
+ $this->charset = strtoupper(config_item('charset'));
+
if (count($config) > 0)
{
$this->initialize($config);