Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

This commit is contained in:
Taylor Otwell 2011-06-30 19:25:56 -05:00
parent fe28fbba0d 0013e5bcbe
commit 9dbcca0e39
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
system/validation/message.php
View File

@ -88,6 +88,17 @@ private static function get_rangable_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.
// ---------------------------------------------------------

9
system/validator.php
View File

@ -29,10 +29,15 @@ class Validator {
* @param mixed $target
* @return void
*/
public function __construct($target = array())
public function __construct($target = null)
{
$this->errors = new Validation\Error_Collector;
if (is_null($target))
{
$target = Input::get();
}
// ---------------------------------------------------------
// If the source is an Eloquent model, use the model's
// attributes as the validation attributes.
@ -46,7 +51,7 @@ public function __construct($target = array())
* @param mixed $target
* @return Validator
*/
public static function make($target = array())
public static function make($target = null)
{
return new static($target);
}