Update Kohana to r3890

1 files changed, 15 insertions, 15 deletions

diff --git a/kohana/core/Kohana.php b/kohana/core/Kohana.php
index c4812e63..76964fbd 100644
--- a/kohana/core/Kohana.php
+++ b/kohana/core/Kohana.php
@@ -109,7 +109,7 @@ final class Kohana {
 
 		if (function_exists('date_default_timezone_set'))
 		{
-			$timezone = Kohana::config('locale.timezone');
+			$timezone = self::config('locale.timezone');
 
 			// Set default timezone, due to increased validation of date settings
 			// which cause massive amounts of E_NOTICEs to be generated in PHP 5.2+
@@ -168,10 +168,10 @@ final class Kohana {
 		// Enable Kohana output handling
 		Event::add('system.shutdown', array('Kohana', 'shutdown'));
 
-		if (Kohana::config('core.enable_hooks') === TRUE)
+		if (self::config('core.enable_hooks') === TRUE)
 		{
 			// Find all the hook files
-			$hooks = Kohana::list_files('hooks', TRUE);
+			$hooks = self::list_files('hooks', TRUE);
 
 			foreach ($hooks as $file)
 			{
@@ -700,7 +700,7 @@ final class Kohana {
 		// Fetch benchmark for page execution time
 		$benchmark = Benchmark::get(SYSTEM_BENCHMARK.'_total_execution');
 
-		if (Kohana::config('core.render_stats') === TRUE)
+		if (self::config('core.render_stats') === TRUE)
 		{
 			// Replace the global template variables
 			$output = str_replace(
@@ -724,7 +724,7 @@ final class Kohana {
 			);
 		}
 
-		if ($level = Kohana::config('core.output_compression') AND ini_get('output_handler') !== 'ob_gzhandler' AND (int) ini_get('zlib.output_compression') === 0)
+		if ($level = self::config('core.output_compression') AND ini_get('output_handler') !== 'ob_gzhandler' AND (int) ini_get('zlib.output_compression') === 0)
 		{
 			if ($level < 1 OR $level > 9)
 			{
@@ -1123,7 +1123,7 @@ final class Kohana {
 
 		if ($path === FALSE)
 		{
-			$paths = array_reverse(Kohana::include_paths());
+			$paths = array_reverse(self::include_paths());
 
 			foreach ($paths as $path)
 			{
@@ -1173,7 +1173,7 @@ final class Kohana {
 		$group = $group[0];
 
 		// Get locale name
-		$locale = Kohana::config('locale.language.0');
+		$locale = self::config('locale.language.0');
 
 		if ( ! isset(self::$internal_cache['language'][$locale][$group]))
 		{
@@ -1211,7 +1211,7 @@ final class Kohana {
 
 		if ($line === NULL)
 		{
-			Kohana::log('error', 'Missing i18n entry '.$key.' for language '.$locale);
+			self::log('error', 'Missing i18n entry '.$key.' for language '.$locale);
 
 			// Return the key string as fallback
 			return $key;
@@ -1364,20 +1364,20 @@ final class Kohana {
 
 		// Return the raw string
 		if ($key === 'agent')
-			return Kohana::$user_agent;
+			return self::$user_agent;
 
 		if ($info === NULL)
 		{
 			// Parse the user agent and extract basic information
-			$agents = Kohana::config('user_agents');
+			$agents = self::config('user_agents');
 
 			foreach ($agents as $type => $data)
 			{
 				foreach ($data as $agent => $name)
 				{
-					if (stripos(Kohana::$user_agent, $agent) !== FALSE)
+					if (stripos(self::$user_agent, $agent) !== FALSE)
 					{
-						if ($type === 'browser' AND preg_match('|'.preg_quote($agent).'[^0-9.]*+([0-9.][0-9.a-z]*)|i', Kohana::$user_agent, $match))
+						if ($type === 'browser' AND preg_match('|'.preg_quote($agent).'[^0-9.]*+([0-9.][0-9.a-z]*)|i', self::$user_agent, $match))
 						{
 							// Set the browser version
 							$info['version'] = $match[1];
@@ -1445,11 +1445,11 @@ final class Kohana {
 			{
 				case 'accept_lang':
 					// Check if the lange is accepted
-					return in_array($compare, Kohana::user_agent('languages'));
+					return in_array($compare, self::user_agent('languages'));
 				break;
 				case 'accept_charset':
 					// Check if the charset is accepted
-					return in_array($compare, Kohana::user_agent('charsets'));
+					return in_array($compare, self::user_agent('charsets'));
 				break;
 				default:
 					// Invalid comparison
@@ -1505,7 +1505,7 @@ final class Kohana {
 
 			if (isset($entry['file']))
 			{
-				$temp .= Kohana::lang('core.error_file_line', preg_replace('!^'.preg_quote(DOCROOT).'!', '', $entry['file']), $entry['line']);
+				$temp .= self::lang('core.error_file_line', preg_replace('!^'.preg_quote(DOCROOT).'!', '', $entry['file']), $entry['line']);
 			}
 
 			$temp .= '<pre>';