From 3549be4242d84b4cba0a00ecde0d58c90efbf0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Potk=C3=A1ny?= Date: Wed, 25 Mar 2015 14:04:16 +0100 Subject: [PATCH 1/2] Fix language overriding for calendar library --- system/libraries/Calendar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php index 014daac58cc..9059594bbd8 100644 --- a/system/libraries/Calendar.php +++ b/system/libraries/Calendar.php @@ -131,7 +131,7 @@ public function __construct($config = array()) { $this->CI =& get_instance(); - if ( ! in_array('calendar_lang.php', $this->CI->lang->is_loaded, TRUE)) + if ( ! array_key_exists('calendar_lang.php', $this->CI->lang->is_loaded)) { $this->CI->lang->load('calendar'); } From 51fe87aea6a9588f24c9143338bdc5d0975821f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Potk=C3=A1ny?= Date: Wed, 25 Mar 2015 19:15:02 +0100 Subject: [PATCH 2/2] use isset instead of array_key_exist --- system/libraries/Calendar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php index 9059594bbd8..42fa00af240 100644 --- a/system/libraries/Calendar.php +++ b/system/libraries/Calendar.php @@ -131,7 +131,7 @@ public function __construct($config = array()) { $this->CI =& get_instance(); - if ( ! array_key_exists('calendar_lang.php', $this->CI->lang->is_loaded)) + if ( ! isset($this->CI->lang->is_loaded['calendar_lang.php'])) { $this->CI->lang->load('calendar'); }