Commit 9dbcca0e by Taylor Otwell

Merge branch 'develop'

parents fe28fbba 0013e5bc
...@@ -89,6 +89,17 @@ class Message { ...@@ -89,6 +89,17 @@ class Message {
private static function get_upload_of_message($rule) private static function get_upload_of_message($rule)
{ {
// --------------------------------------------------------- // ---------------------------------------------------------
// Upload_Of rules sometimes set a "presence_of" error.
//
// This occurs when the uploaded file didn't exist and the
// "not_required" method was not called.
// ---------------------------------------------------------
if ($rule->error == 'presence_of')
{
return static::get_message($rule);
}
// ---------------------------------------------------------
// Slice "file_" off of the error type. // Slice "file_" off of the error type.
// --------------------------------------------------------- // ---------------------------------------------------------
$error_type = substr($rule->error, 5); $error_type = substr($rule->error, 5);
......
...@@ -29,10 +29,15 @@ class Validator { ...@@ -29,10 +29,15 @@ class Validator {
* @param mixed $target * @param mixed $target
* @return void * @return void
*/ */
public function __construct($target = array()) public function __construct($target = null)
{ {
$this->errors = new Validation\Error_Collector; $this->errors = new Validation\Error_Collector;
if (is_null($target))
{
$target = Input::get();
}
// --------------------------------------------------------- // ---------------------------------------------------------
// If the source is an Eloquent model, use the model's // If the source is an Eloquent model, use the model's
// attributes as the validation attributes. // attributes as the validation attributes.
...@@ -46,7 +51,7 @@ class Validator { ...@@ -46,7 +51,7 @@ class Validator {
* @param mixed $target * @param mixed $target
* @return Validator * @return Validator
*/ */
public static function make($target = array()) public static function make($target = null)
{ {
return new static($target); return new static($target);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment