ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverting di refactoring.

Browse Source
This commit is contained in:
Taylor Otwell
2011-10-29 22:31:50 -05:00
parent f5680e4537
commit ef9e4dfd61
12 changed files with 101 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
laravel/validation/validator.php
View File

@@ -341,7 +341,7 @@ class Validator {
{
return $this->attributes[$attribute];
}
elseif (array_key_exists($attribute, IoC::container()->core('input')->file()))
elseif (array_key_exists($attribute, Input::file()))
{
return $value['size'] / 1024;
}
@@ -529,9 +529,7 @@ class Validator {
// type of attribute being validated, either a file or a string.
elseif (in_array($rule, $this->size_rules) and ! $this->has_rule($attribute, $this->numeric_rules))
{
$files = IoC::container()->core('input')->file();
$line = (array_key_exists($attribute, $files)) ? "file" : "string";
$line = (array_key_exists($attribute, Input::file())) ? "file" : "string";
return Lang::line("validation.{$rule}.{$line}")->get($this->language);
}