Fix 2 errors caused by recent commits

bcit-ci · Jan 8, 2014 · 4ea76cc · 4ea76cc
1 parent 50a9d86
commit 4ea76cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
@@ -91,7 +91,8 @@ function base_url($uri = '', $protocol = NULL)
 	 */
 	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
@@ -223,7 +223,7 @@ protected function initialize()
 			'encryption_key',
 		);
 
-		$this->_standardize_newlines = (bool) $config['standardize_newlines'];
+		$this->_standardize_newlines = (bool) config_item('standardize_newlines');
 
 		foreach ($prefs as $key)
 		{