diff options
Diffstat (limited to 'system/core')
| -rw-r--r-- | system/core/Lang.php | 2 | ||||
| -rw-r--r-- | system/core/Loader.php | 6 | ||||
| -rw-r--r-- | system/core/URI.php | 7 |
3 files changed, 5 insertions, 10 deletions
diff --git a/system/core/Lang.php b/system/core/Lang.php index 3236709f2..290b38bea 100644 --- a/system/core/Lang.php +++ b/system/core/Lang.php @@ -166,7 +166,7 @@ class CI_Lang { * @param bool $log_errors Whether to log an error message if the line is not found * @return string Translation */ - public function line($line = '', $log_errors = TRUE) + public function line($line, $log_errors = TRUE) { $value = ($line === '' OR ! isset($this->language[$line])) ? FALSE : $this->language[$line]; diff --git a/system/core/Loader.php b/system/core/Loader.php index 70c1e4154..334a5c46e 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -472,16 +472,16 @@ class CI_Loader { /** * Clear Cached Variables - * + * * Clears the cached variables. - * + * * @return void */ public function clear_vars() { $this->_ci_cached_vars = array(); } - + // -------------------------------------------------------------------- /** diff --git a/system/core/URI.php b/system/core/URI.php index bad9985d7..5e4c80a00 100644 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -703,12 +703,7 @@ class CI_URI { { global $RTR; - if (($dir = $RTR->directory) === '/') - { - $dir = ''; - } - - return $dir.implode('/', $this->rsegment_array()); + return ltrim($RTR->directory, '/').implode('/', $this->rsegment_array()); } } |