From 60e38a040b31885ade6887208d1429ac4052f623 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 23 Aug 2018 17:38:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9Bisajax=20ispjax=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Request.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/library/think/Request.php b/library/think/Request.php
index 1af874f9..02e05735 100644
--- a/library/think/Request.php
+++ b/library/think/Request.php
@@ -1257,7 +1257,9 @@ class Request
         if (true === $ajax) {
             return $result;
         } 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) {
             return $result;
         } else {
-            return $this->param(Config::get('var_pjax')) ? true : $result;
+            $result = $this->param(Config::get('var_pjax')) ? true : $result;
+            $this->mergeParam = false;
+            return $result;
         }
     }