mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
thinkphp
2016-10-21 17:36:09 +08:00
parent afa1376941
commit 5a417480a1
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/Validate.php
View File

@@ -612,6 +612,9 @@ class Validate
*/ */
protected function activeUrl($value, $rule) 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); return checkdnsrr($value, $rule);
} }

2
library/think/db/Query.php
View File

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