内核更新

2017-01-14 11:07:28 +08:00
parent 77c1f9c8bf
commit 109cf819be
10 changed files with 336 additions and 80 deletions
--- a/core/library/think/Validate.php
+++ b/core/library/think/Validate.php
@@ -1222,9 +1222,9 @@ class Validate
            $msg = Lang::get(substr($msg, 2, -1));
        }

-        if (is_string($msg) && is_string($rule) && false !== strpos($msg, ':')) {
+        if (is_string($msg) && is_scalar($rule) && false !== strpos($msg, ':')) {
            // 变量替换
-            if (strpos($rule, ',')) {
+            if (is_string($rule) && strpos($rule, ',')) {
                $array = array_pad(explode(',', $rule), 3, '');
            } else {
                $array = array_pad([], 3, '');