改进验证类的activeUrl方法 改进Query类分页方法的参数绑定

library/think/Validate.php

@@ -612,6 +612,9 @@ class Validate
      */
     protected function activeUrl($value, $rule)
     {
+        if (!in_array($rule, ['A', 'MX', 'NS', 'SOA', 'PTR', 'CNAME', 'AAAA', 'A6', 'SRV', 'NAPTR', 'TXT', 'ANY'])) {
+            $rule = 'MX';
+        }
         return checkdnsrr($value, $rule);
     }
 

library/think/db/Query.php

@@ -989,8 +989,8 @@ class Query
 
         if (!isset($total) && !$simple) {
             $options = $this->getOptions();
-            $total   = $this->count();
             $bind    = $this->bind;
+            $total   = $this->count();
             $results = $this->options($options)->bind($bind)->page($page, $listRows)->select();
         } elseif ($simple) {
             $results = $this->limit(($page - 1) * $listRows, $listRows + 1)->select();