LiittleCookie/valitron
1
0
Fork 0
mirror of https://github.com/vlucas/valitron.git synced 2025-12-31 07:01:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix addRule by merging the loaded language with the current messages

Browse Source
This commit is contained in:
Marcos Neves 2013-08-20 22:03:17 -03:00
parent 676e80dd8e
commit cf12d976a6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Valitron/Validator.php
View File

@ -49,7 +49,8 @@ class Validator
// Load language file in directory // Load language file in directory
$langFile = rtrim($langDir, '/') . '/' . $lang . '.php'; $langFile = rtrim($langDir, '/') . '/' . $lang . '.php';
if ( stream_resolve_include_path($langFile) ) { if ( stream_resolve_include_path($langFile) ) {
static::$_ruleMessages = include $langFile; $langMessages = include $langFile;
static::$_ruleMessages = array_merge(static::$_ruleMessages, $langMessages);
} else { } else {
throw new InvalidArgumentException("fail to load language file '$langFile'"); throw new InvalidArgumentException("fail to load language file '$langFile'");
} }