diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-01-08 20:49:23 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-01-08 20:49:23 +0100 |
| commit | 4ea76cc2216b19bfae38dbbfe7104c21ee278d81 (patch) | |
| tree | f8b6c58a5549717d08e5dff2ab2f315ea92bb4d7 | |
| parent | 50a9d863dd56a3667d8dfb4b8c66d8035bb26956 (diff) | |
Fix 2 errors caused by recent commits
| -rw-r--r-- | system/helpers/url_helper.php | 3 | ||||
| -rw-r--r-- | system/libraries/Session/drivers/Session_cookie.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 2d9289791..f819b96e9 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -91,7 +91,8 @@ if ( ! function_exists('current_url')) */ function current_url() { - return get_instance()->config->site_url($CI->uri->uri_string()); + $CI =& get_instance(); + return $CI->config->site_url($CI->uri->uri_string()); } } diff --git a/system/libraries/Session/drivers/Session_cookie.php b/system/libraries/Session/drivers/Session_cookie.php index 65debcb44..971dfeabe 100644 --- a/system/libraries/Session/drivers/Session_cookie.php +++ b/system/libraries/Session/drivers/Session_cookie.php @@ -223,7 +223,7 @@ class CI_Session_cookie extends CI_Session_driver { 'encryption_key', ); - $this->_standardize_newlines = (bool) $config['standardize_newlines']; + $this->_standardize_newlines = (bool) config_item('standardize_newlines'); foreach ($prefs as $key) { |