Updated upstream to kohana/kohana@af7ce3d

kohana3/modified/system/classes/Arr.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class Arr extends Kohana_Arr {}
+class Arr extends Kohana_Arr {}

kohana3/modified/system/classes/Config.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class Config extends Kohana_Config {}
+class Config extends Kohana_Config {}

kohana3/modified/system/classes/Config/File.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class Config_File extends Kohana_Config_File {}
+class Config_File extends Kohana_Config_File {}

kohana3/modified/system/classes/Config/Group.php

@@ -1,4 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-
-class Config_Group extends Kohana_Config_Group {}
+class Config_Group extends Kohana_Config_Group {}

kohana3/modified/system/classes/File.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class File extends Kohana_File {}
+class File extends Kohana_File {}

kohana3/modified/system/classes/HTML.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTML extends Kohana_HTML {}
+class HTML extends Kohana_HTML {}

kohana3/modified/system/classes/HTTP.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-abstract class HTTP extends Kohana_HTTP {}
+abstract class HTTP extends Kohana_HTTP {}

kohana3/modified/system/classes/HTTP/Exception.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception extends Kohana_HTTP_Exception {}
+class HTTP_Exception extends Kohana_HTTP_Exception {}

kohana3/modified/system/classes/HTTP/Exception/300.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_300 extends Kohana_HTTP_Exception_300 {}
+class HTTP_Exception_300 extends Kohana_HTTP_Exception_300 {}

kohana3/modified/system/classes/HTTP/Exception/301.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_301 extends Kohana_HTTP_Exception_301 {}
+class HTTP_Exception_301 extends Kohana_HTTP_Exception_301 {}

kohana3/modified/system/classes/HTTP/Exception/302.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_302 extends Kohana_HTTP_Exception_302 {}
+class HTTP_Exception_302 extends Kohana_HTTP_Exception_302 {}

kohana3/modified/system/classes/HTTP/Exception/303.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_303 extends Kohana_HTTP_Exception_303 {}
+class HTTP_Exception_303 extends Kohana_HTTP_Exception_303 {}

kohana3/modified/system/classes/HTTP/Exception/304.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_304 extends Kohana_HTTP_Exception_304 {}
+class HTTP_Exception_304 extends Kohana_HTTP_Exception_304 {}

kohana3/modified/system/classes/HTTP/Exception/305.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_305 extends Kohana_HTTP_Exception_305 {}
+class HTTP_Exception_305 extends Kohana_HTTP_Exception_305 {}

kohana3/modified/system/classes/HTTP/Exception/307.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_307 extends Kohana_HTTP_Exception_307 {}
+class HTTP_Exception_307 extends Kohana_HTTP_Exception_307 {}

kohana3/modified/system/classes/HTTP/Exception/400.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_400 extends Kohana_HTTP_Exception_400 {}
+class HTTP_Exception_400 extends Kohana_HTTP_Exception_400 {}

kohana3/modified/system/classes/HTTP/Exception/401.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_401 extends Kohana_HTTP_Exception_401 {}
+class HTTP_Exception_401 extends Kohana_HTTP_Exception_401 {}

kohana3/modified/system/classes/HTTP/Exception/402.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_402 extends Kohana_HTTP_Exception_402 {}
+class HTTP_Exception_402 extends Kohana_HTTP_Exception_402 {}

kohana3/modified/system/classes/HTTP/Exception/403.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_403 extends Kohana_HTTP_Exception_403 {}
+class HTTP_Exception_403 extends Kohana_HTTP_Exception_403 {}

kohana3/modified/system/classes/HTTP/Exception/404.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_404 extends Kohana_HTTP_Exception_404 {}
+class HTTP_Exception_404 extends Kohana_HTTP_Exception_404 {}

kohana3/modified/system/classes/HTTP/Exception/405.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_405 extends Kohana_HTTP_Exception_405 {}
+class HTTP_Exception_405 extends Kohana_HTTP_Exception_405 {}

kohana3/modified/system/classes/HTTP/Exception/406.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_406 extends Kohana_HTTP_Exception_406 {}
+class HTTP_Exception_406 extends Kohana_HTTP_Exception_406 {}

kohana3/modified/system/classes/HTTP/Exception/407.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_407 extends Kohana_HTTP_Exception_407 {}
+class HTTP_Exception_407 extends Kohana_HTTP_Exception_407 {}

kohana3/modified/system/classes/HTTP/Exception/408.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_408 extends Kohana_HTTP_Exception_408 {}
+class HTTP_Exception_408 extends Kohana_HTTP_Exception_408 {}

kohana3/modified/system/classes/HTTP/Exception/409.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_409 extends Kohana_HTTP_Exception_409 {}
+class HTTP_Exception_409 extends Kohana_HTTP_Exception_409 {}

kohana3/modified/system/classes/HTTP/Exception/410.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_410 extends Kohana_HTTP_Exception_410 {}
+class HTTP_Exception_410 extends Kohana_HTTP_Exception_410 {}

kohana3/modified/system/classes/HTTP/Exception/411.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_411 extends Kohana_HTTP_Exception_411 {}
+class HTTP_Exception_411 extends Kohana_HTTP_Exception_411 {}

kohana3/modified/system/classes/HTTP/Exception/412.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_412 extends Kohana_HTTP_Exception_412 {}
+class HTTP_Exception_412 extends Kohana_HTTP_Exception_412 {}

kohana3/modified/system/classes/HTTP/Exception/413.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_413 extends Kohana_HTTP_Exception_413 {}
+class HTTP_Exception_413 extends Kohana_HTTP_Exception_413 {}

kohana3/modified/system/classes/HTTP/Exception/414.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_414 extends Kohana_HTTP_Exception_414 {}
+class HTTP_Exception_414 extends Kohana_HTTP_Exception_414 {}

kohana3/modified/system/classes/HTTP/Exception/415.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_415 extends Kohana_HTTP_Exception_415 {}
+class HTTP_Exception_415 extends Kohana_HTTP_Exception_415 {}

kohana3/modified/system/classes/HTTP/Exception/416.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_416 extends Kohana_HTTP_Exception_416 {}
+class HTTP_Exception_416 extends Kohana_HTTP_Exception_416 {}

kohana3/modified/system/classes/HTTP/Exception/417.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_417 extends Kohana_HTTP_Exception_417 {}
+class HTTP_Exception_417 extends Kohana_HTTP_Exception_417 {}

kohana3/modified/system/classes/HTTP/Exception/500.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_500 extends Kohana_HTTP_Exception_500 {}
+class HTTP_Exception_500 extends Kohana_HTTP_Exception_500 {}

kohana3/modified/system/classes/HTTP/Exception/501.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_501 extends Kohana_HTTP_Exception_501 {}
+class HTTP_Exception_501 extends Kohana_HTTP_Exception_501 {}

kohana3/modified/system/classes/HTTP/Exception/502.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_502 extends Kohana_HTTP_Exception_502 {}
+class HTTP_Exception_502 extends Kohana_HTTP_Exception_502 {}

kohana3/modified/system/classes/HTTP/Exception/503.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_503 extends Kohana_HTTP_Exception_503 {}
+class HTTP_Exception_503 extends Kohana_HTTP_Exception_503 {}

kohana3/modified/system/classes/HTTP/Exception/504.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_504 extends Kohana_HTTP_Exception_504 {}
+class HTTP_Exception_504 extends Kohana_HTTP_Exception_504 {}

kohana3/modified/system/classes/HTTP/Exception/505.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Exception_505 extends Kohana_HTTP_Exception_505 {}
+class HTTP_Exception_505 extends Kohana_HTTP_Exception_505 {}

kohana3/modified/system/classes/HTTP/Exception/Expected.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-abstract class HTTP_Exception_Expected extends Kohana_HTTP_Exception_Expected {}
+abstract class HTTP_Exception_Expected extends Kohana_HTTP_Exception_Expected {}

kohana3/modified/system/classes/HTTP/Exception/Redirect.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-abstract class HTTP_Exception_Redirect extends Kohana_HTTP_Exception_Redirect {}
+abstract class HTTP_Exception_Redirect extends Kohana_HTTP_Exception_Redirect {}

kohana3/modified/system/classes/HTTP/Header.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class HTTP_Header extends Kohana_HTTP_Header {}
+class HTTP_Header extends Kohana_HTTP_Header {}

kohana3/modified/system/classes/HTTP/Message.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-interface HTTP_Message extends Kohana_HTTP_Message {}
+interface HTTP_Message extends Kohana_HTTP_Message {}

kohana3/modified/system/classes/HTTP/Request.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-interface HTTP_Request extends Kohana_HTTP_Request {}
+interface HTTP_Request extends Kohana_HTTP_Request {}

kohana3/modified/system/classes/HTTP/Response.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-interface HTTP_Response extends Kohana_HTTP_Response {}
+interface HTTP_Response extends Kohana_HTTP_Response {}

kohana3/modified/system/classes/Inflector.php

@@ -1,3 +1,3 @@
 <?php defined('SYSPATH') OR die('No direct script access.');
 
-class Inflector extends Kohana_Inflector {}
+class Inflector extends Kohana_Inflector {}

kohana3/modified/system/classes/Kohana/Arr.php

@@ -283,7 +283,7 @@ public static function get($array, $key, $default = NULL)
 	 *
 	 *     // Get the values "username", "password" from $_POST
 	 *     $auth = Arr::extract($_POST, array('username', 'password'));
-	 *     
+	 *
 	 *     // Get the value "level1.level2a" from $data
 	 *     $data = array('level1' => array('level2a' => 'value 1', 'level2b' => 'value 2'));
 	 *     Arr::extract($data, array('level1.level2a', 'password'));
@@ -617,4 +617,4 @@ public static function flatten($array)
 		return $flat;
 	}
 
-} // End arr
+}

kohana3/modified/system/classes/Kohana/Config.php

@@ -3,7 +3,7 @@
  * Wrapper for configuration arrays. Multiple configuration readers can be
  * attached to allow loading configuration from files, database, etc.
  *
- * Configuration directives cascade across config sources in the same way that 
+ * Configuration directives cascade across config sources in the same way that
  * files cascade across the filesystem.
  *
  * Directives from sources high in the sources list will override ones from those
@@ -74,9 +74,9 @@ public function detach(Kohana_Config_Source $source)
 	}
 
 	/**
-	 * Load a configuration group. Searches all the config sources, merging all the 
-	 * directives found into a single config group.  Any changes made to the config 
-	 * in this group will be mirrored across all writable sources.  
+	 * Load a configuration group. Searches all the config sources, merging all the
+	 * directives found into a single config group.  Any changes made to the config
+	 * in this group will be mirrored across all writable sources.
 	 *
 	 *     $array = $config->load($name);
 	 *
@@ -146,7 +146,7 @@ public function load($group)
 
 	/**
 	 * Copy one configuration group to all of the other writers.
-	 * 
+	 *
 	 *     $config->copy($name);
 	 *
 	 * @param   string  $group  configuration group name
@@ -181,12 +181,12 @@ public function _write_config($group, $key, $value)
 			{
 				continue;
 			}
-			
+
 			// Copy each value in the config
 			$source->write($group, $key, $value);
 		}
 
 		return $this;
 	}
 
-} // End Kohana_Config
+}

kohana3/modified/system/classes/Kohana/Config/File.php

@@ -9,7 +9,7 @@
  * @copyright  (c) 2009-2012 Kohana Team
  * @license    http://kohanaframework.org/license
  */
-class Kohana_Config_File extends Kohana_Config_File_Reader 
+class Kohana_Config_File extends Kohana_Config_File_Reader
 {
 	// @see Kohana_Config_File_Reader
 }

kohana3/modified/system/classes/Kohana/Config/File/Reader.php

@@ -53,4 +53,4 @@ public function load($group)
 		return $config;
 	}
 
-} // End Kohana_Config
+}

kohana3/modified/system/classes/Kohana/Config/Group.php

@@ -4,7 +4,7 @@
  * The group wrapper acts as an interface to all the config directives
  * gathered from across the system.
  *
- * This is the object returned from Kohana_Config::load 
+ * This is the object returned from Kohana_Config::load
  *
  * Any modifications to configuration items should be done through an instance of this object
  *
@@ -31,7 +31,7 @@ class Kohana_Config_Group extends ArrayObject {
 	protected $_group_name = '';
 
 	/**
-	 * Constructs the group object.  Kohana_Config passes the config group 
+	 * Constructs the group object.  Kohana_Config passes the config group
 	 * and its config items to the object here.
 	 *
 	 * @param Kohana_Config  $instance "Owning" instance of Kohana_Config
@@ -77,7 +77,7 @@ public function group_name()
 	{
 		return $this->_group_name;
 	}
-	
+
 	/**
 	 * Get a variable from the configuration or return the default value.
 	 *
@@ -110,7 +110,7 @@ public function set($key, $value)
 
 	/**
 	 * Overrides ArrayObject::offsetSet()
-	 * This method is called when config is changed via 
+	 * This method is called when config is changed via
 	 *
 	 *     $config->var = 'asd';
 	 *
@@ -127,4 +127,5 @@ public function offsetSet($key, $value)
 
 		return parent::offsetSet($key, $value);
 	}
+
 }