summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-03-26 19:58:19 +0100
committerAndrey Andreev <narf@devilix.net>2015-03-26 19:58:19 +0100
commit03404890a5a0ea9c5e02c235a94312741bdf05b2 (patch)
treeb9ff0d6100b38da82ff789cdf32f05272a8c9a87
parentaebd039a61cb5135b31ab0b8d9d95ed3fb678c7b (diff)
Remove an unnecessary check
#3700 #3706
-rw-r--r--system/libraries/Calendar.php6
-rw-r--r--tests/codeigniter/core/Lang_test.php3
2 files changed, 2 insertions, 7 deletions
diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php
index 42fa00af2..f6a0c39c4 100644
--- a/system/libraries/Calendar.php
+++ b/system/libraries/Calendar.php
@@ -130,11 +130,7 @@ class CI_Calendar {
public function __construct($config = array())
{
$this->CI =& get_instance();
-
- if ( ! isset($this->CI->lang->is_loaded['calendar_lang.php']))
- {
- $this->CI->lang->load('calendar');
- }
+ $this->CI->lang->load('calendar');
empty($config) OR $this->initialize($config);
diff --git a/tests/codeigniter/core/Lang_test.php b/tests/codeigniter/core/Lang_test.php
index 87a71c885..929bc2ffd 100644
--- a/tests/codeigniter/core/Lang_test.php
+++ b/tests/codeigniter/core/Lang_test.php
@@ -32,7 +32,7 @@ class Lang_test extends CI_TestCase {
// A language other than english
$this->ci_vfs_clone('system/language/english/email_lang.php', 'system/language/german/');
$this->assertTrue($this->lang->load('email', 'german'));
- $this->assertEquals('german', $this->lang->is_loaded['email_lang.php'] );
+ $this->assertEquals('german', $this->lang->is_loaded['email_lang.php']);
// Non-alpha idiom (should act the same as unspecified language)
$this->ci_vfs_clone('system/language/english/number_lang.php');
@@ -60,5 +60,4 @@ class Lang_test extends CI_TestCase {
$this->assertFalse($this->lang->line('nonexistent_string'));
$this->assertFalse($this->lang->line(NULL));
}
-
}