summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-03-26 11:05:12 +0100
committerAndrey Andreev <narf@devilix.net>2015-03-26 11:05:12 +0100
commit5639a57568d42d60b5ab82bdcf057a2c7994ca60 (patch)
tree3183377c68140e8e17935e9e4831f9f07c24fb48 /system
parent343a3e948957daf16a9b25f79339abc00dd04db7 (diff)
parent51fe87aea6a9588f24c9143338bdc5d0975821f9 (diff)
Merge pull request #3700 from gadelat/develop
Fix language overriding for calendar library
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Calendar.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php
index 014daac58..42fa00af2 100644
--- a/system/libraries/Calendar.php
+++ b/system/libraries/Calendar.php
@@ -131,7 +131,7 @@ class CI_Calendar {
{
$this->CI =& get_instance();
- if ( ! in_array('calendar_lang.php', $this->CI->lang->is_loaded, TRUE))
+ if ( ! isset($this->CI->lang->is_loaded['calendar_lang.php']))
{
$this->CI->lang->load('calendar');
}