refactoring various pieces of the framework.

2011-10-18 20:19:36 -05:00
parent e985057b4c
commit 9fc9f88a41
18 changed files with 193 additions and 114 deletions
--- a/laravel/validation/validator.php
+++ b/laravel/validation/validator.php
@@ -563,7 +563,9 @@ class Validator {
 			// Except for "between" every replacement should be the first parameter.
 			$max = ($rule == 'between') ? $parameters[1] : $parameters[0];

-			$message = str_replace(array(':size', ':min', ':max'), array($parameters[0], $parameters[0], $max), $message);
+			$replace =  array($parameters[0], $parameters[0], $max);
+
+			$message = str_replace(array(':size', ':min', ':max'), $replace, $message);
 		}
 		elseif (in_array($rule, $this->inclusion_rules))
 		{