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); } /**