Fix 2 errors caused by recent commits

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)
 		{