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

fixing merge issues

Browse Source
This commit is contained in:
Dayle Rees
2012-07-27 13:52:15 +01:00
parent da35e257fd b325e954e3
commit 2c6ed23b45
48 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
laravel/validator.php
View File

@@ -422,8 +422,8 @@ class Validator {
protected function size($attribute, $value)
{
// This method will determine if the attribute is a number, string, or file and
// return the proper size accordingly. If it is a number, then number itself is
// the size; if it is a file, the size is kilobytes in the size; if it is a
// return the proper size accordingly. If it is a number, the number itself is
// the size; if it is a file, the kilobytes is the size; if it is a
// string, the length is the size.
if (is_numeric($value) and $this->has_rule($attribute, $this->numeric_rules))
{
@@ -764,7 +764,7 @@ class Validator {
}
// We assume that attributes present in the $_FILES array are files,
// which makes sense. If the attribute doesn't have numeric rules
// and isn't as file, it's a string.
// and isn't a file, it's a string.
elseif (array_key_exists($attribute, Input::file()))
{
$line = 'file';
@@ -883,7 +883,7 @@ class Validator {
}
/**
* Replace all place-holders for the not_in rule.
* Replace all place-holders for the mimes rule.
*
* @param string $message
* @param string $attribute