From 294a49b8b1f65ab865a20d10cd54e6f3e72e587b Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 21 Oct 2016 17:51:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E9=AA=8C=E8=AF=81=E7=B1=BB?=
 =?UTF-8?q?=E7=9A=84image=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Validate.php | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/library/think/Validate.php b/library/think/Validate.php
index f16fee1b..0986c836 100644
--- a/library/think/Validate.php
+++ b/library/think/Validate.php
@@ -723,19 +723,24 @@ class Validate
         if (!($file instanceof File)) {
             return false;
         }
-        $rule                        = explode(',', $rule);
-        list($width, $height, $type) = getimagesize($file->getRealPath());
-        if (isset($rule[2])) {
-            $imageType = strtolower($rule[2]);
-            if ('jpeg' == $imageType) {
-                $imageType = 'jpg';
-            }
-            if (image_type_to_extension($type, false) != $imageType) {
-                return false;
+        if ($rule) {
+            $rule                        = explode(',', $rule);
+            list($width, $height, $type) = getimagesize($file->getRealPath());
+            if (isset($rule[2])) {
+                $imageType = strtolower($rule[2]);
+                if ('jpeg' == $imageType) {
+                    $imageType = 'jpg';
+                }
+                if (image_type_to_extension($type, false) != $imageType) {
+                    return false;
+                }
             }
+
+            list($w, $h) = $rule;
+            return $w == $width && $h == $height;
+        } else {
+            return in_array($this->getImageType($file->getRealPath()), [1, 2, 3, 6]);
         }
-        list($w, $h) = $rule;
-        return $w == $width && $h == $height;
     }
 
     /**