Upgrade to KH 3.1.3.1

includes/kohana/system/config/credit_cards.php

@@ -1,4 +1,4 @@
-<?php defined('SYSPATH') or die('No direct access allowed.');
+<?php defined('SYSPATH') or die('No direct script access.');
 /**
  * Credit card validation configuration.
  *

includes/kohana/system/config/curl.php

@@ -0,0 +1,9 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+	CURLOPT_USERAGENT      => 'Mozilla/5.0 (compatible; Kohana v'.Kohana::VERSION.' +http://kohanaframework.org/)',
+	CURLOPT_CONNECTTIMEOUT => 5,
+	CURLOPT_TIMEOUT        => 5,
+	CURLOPT_HEADERFUNCTION => array('Request_Client_External', '_parse_headers'),
+	CURLOPT_HEADER         => FALSE,
+);

includes/kohana/system/config/inflector.php

@@ -1,13 +1,16 @@
-<?php defined('SYSPATH') or die('No direct access allowed.');
+<?php defined('SYSPATH') or die('No direct script access.');
 
 return array(
 
 	'uncountable' => array(
 		'access',
 		'advice',
+		'aircraft',
 		'art',
 		'baggage',
+		'bison',
 		'dances',
+		'deer',
 		'equipment',
 		'fish',
 		'fuel',
@@ -19,7 +22,9 @@ return array(
 		'information',
 		'knowledge',
 		'luggage',
+		'media',
 		'money',
+		'moose',
 		'music',
 		'news',
 		'patience',
@@ -27,12 +32,15 @@ return array(
 		'pollution',
 		'research',
 		'rice',
+		'salmon',
 		'sand',
 		'series',
 		'sheep',
 		'sms',
+		'spam',
 		'species',
 		'staff',
+		'swine',
 		'toothpaste',
 		'traffic',
 		'understanding',
@@ -57,5 +65,7 @@ return array(
 		'was' => 'were',
 		'is' => 'are',
 		'verse' => 'verses',
+		'hero' => 'heroes',
+		'purchase' => 'purchases',
 	),
 );

includes/kohana/system/config/mimes.php

@@ -1,4 +1,4 @@
-<?php defined('SYSPATH') or die('No direct access allowed.');
+<?php defined('SYSPATH') or die('No direct script access.');
 /**
  * A list of mime types. Our list is generally more complete and accurate than
  * the operating system MIME list.
@@ -17,6 +17,7 @@ return array
 	'aif'   => array('audio/x-aiff'),
 	'aifc'  => array('audio/x-aiff'),
 	'aiff'  => array('audio/x-aiff'),
+	'amf'   => array('application/x-amf'),
 	'asf'   => array('video/x-ms-asf'),
 	'asr'   => array('video/x-ms-asf'),
 	'asx'   => array('video/x-ms-asf'),

includes/kohana/system/config/user_agents.php

@@ -1,4 +1,4 @@
-<?php defined('SYSPATH') or die('No direct access allowed.');
+<?php defined('SYSPATH') or die('No direct script access.');
 
 return array(
 
@@ -88,6 +88,8 @@ return array(
 		'blackBerry'     => 'BlackBerry',
 		'motorola'       => 'Motorola',
 		'iphone'         => 'iPhone',
+		'ipad'           => 'iPad',
+		'ipod'           => 'iPod',
 		'android'        => 'Android',
 	),
 

includes/kohana/system/config/userguide.php

@@ -0,0 +1,23 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+	// Leave this alone
+	'modules' => array(
+
+		// This should be the path to this modules userguide pages, without the 'guide/'. Ex: '/guide/modulename/' would be 'modulename'
+		'kohana' => array(
+
+			// Whether this modules userguide pages should be shown
+			'enabled' => TRUE,
+			
+			// The name that should show up on the userguide index page
+			'name' => 'Kohana',
+
+			// A short description of this module, shown on the index page
+			'description' => 'Documentation for Kohana core/system.',
+			
+			// Copyright message, shown in the footer for this module
+			'copyright' => '&copy; 2008–2010 Kohana Team',
+		)	
+	)
+);