summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlakoff <vlakoff@gmail.com>2013-07-25 12:18:43 +0200
committervlakoff <vlakoff@gmail.com>2013-07-25 12:18:43 +0200
commitc1044cb62e39709aa14f86a56bc950a78cfc713c (patch)
tree032dea4d5dac9184bd2278fec9d9d4f8906810a3
parent90f316a8615fbbbc0810d945dd1a237662c6bfbf (diff)
Uniformize slash_item() with item()
-rw-r--r--system/core/Config.php4
-rw-r--r--tests/codeigniter/core/Config_test.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Config.php b/system/core/Config.php
index e7cbe5624..109ee6424 100644
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -202,13 +202,13 @@ class CI_Config {
* Fetch a config file item with slash appended (if not empty)
*
* @param string $item Config item name
- * @return string|bool The configuration item or FALSE on failure
+ * @return string|null The configuration item or NULL if the item doesn't exist
*/
public function slash_item($item)
{
if ( ! isset($this->config[$item]))
{
- return FALSE;
+ return NULL;
}
elseif (trim($this->config[$item]) === '')
{
diff --git a/tests/codeigniter/core/Config_test.php b/tests/codeigniter/core/Config_test.php
index 72f47cd51..ba9a2c070 100644
--- a/tests/codeigniter/core/Config_test.php
+++ b/tests/codeigniter/core/Config_test.php
@@ -46,7 +46,7 @@ class Config_test extends CI_TestCase {
public function test_slash_item()
{
// Bad Config value
- $this->assertFalse($this->config->slash_item('no_good_item'));
+ $this->assertNull($this->config->slash_item('no_good_item'));
$this->assertEquals($this->cfg['base_url'], $this->config->slash_item('base_url'));
$this->assertEquals($this->cfg['subclass_prefix'].'/', $this->config->slash_item('subclass_prefix'));