From 2477345218b0d69ff1dd0bb6b913909c7feeb13f Mon Sep 17 00:00:00 2001 From: thinkphp Date: Tue, 25 Oct 2016 14:46:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Connection=E7=B1=BB=E7=9A=84g?= =?UTF-8?q?etRealSql=E6=96=B9=E6=B3=95=E7=94=9F=E6=88=90=E7=9A=84sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/App.php | 4 +--- library/think/db/Connection.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/library/think/App.php b/library/think/App.php index ddb147f3..40c726c8 100644 --- a/library/think/App.php +++ b/library/think/App.php @@ -390,9 +390,7 @@ class App Hook::listen('action_begin', $call); - $data = self::invokeMethod($call); - - return $data; + return self::invokeMethod($call); } /** diff --git a/library/think/db/Connection.php b/library/think/db/Connection.php index f39ca341..9806b827 100644 --- a/library/think/db/Connection.php +++ b/library/think/db/Connection.php @@ -433,7 +433,7 @@ abstract class Connection $sql . ' '); } } - return $sql; + return rtrim($sql); } /**