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

改进isajax ispjax方法

Browse Source
This commit is contained in:
thinkphp
2018-08-23 17:38:39 +08:00
parent 29c6111748
commit 60e38a040b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Request.php
View File

@@ -1257,7 +1257,9 @@ class Request
if (true === $ajax) { if (true === $ajax) {
return $result; return $result;
} else { } else {
return $this->param(Config::get('var_ajax')) ? true : $result; $result = $this->param(Config::get('var_ajax')) ? true : $result;
$this->mergeParam = false;
return $result;
} }
} }
@@ -1273,7 +1275,9 @@ class Request
if (true === $pjax) { if (true === $pjax) {
return $result; return $result;
} else { } else {
return $this->param(Config::get('var_pjax')) ? true : $result; $result = $this->param(Config::get('var_pjax')) ? true : $result;
$this->mergeParam = false;
return $result;
} }
} }