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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Taylor Otwell
2013-01-05 14:05:21 -06:00
parent 912f4e5e72 731cec2475
commit 423be0495b
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
laravel/validator.php
View File

@@ -269,8 +269,9 @@ class Validator {
protected function validate_required_with($attribute, $value, $parameters)
{
$other = $parameters[0];
$other_value = array_get($this->attributes, $other);
if ($this->validate_required($other, $this->attributes[$other]))
if ($this->validate_required($other, $other_value))
{
return $this->validate_required($attribute, $value);
}
@@ -986,7 +987,7 @@ class Validator {
*/
protected function replace_same($message, $attribute, $rule, $parameters)
{
return str_replace(':other', $parameters[0], $message);
return str_replace(':other', $this->attribute($parameters[0]), $message);
}
/**
@@ -1000,7 +1001,7 @@ class Validator {
*/
protected function replace_different($message, $attribute, $rule, $parameters)
{
return str_replace(':other', $parameters[0], $message);
return str_replace(':other', $this->attribute($parameters[0]), $message);
}
/**