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

Merge branch 'master' of https://github.com/top-think/think

Browse Source
This commit is contained in:
thinkphp
2015-12-22 21:37:00 +08:00
parent 52821b9b17 e5ecdde9dc
commit f9e190bc42
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/response.php
View File

@@ -99,7 +99,7 @@ class Response
'time' => NOW_TIME, 'time' => NOW_TIME,
'data' => $data, 'data' => $data,
]; ];
self::returnData($result, $type, true); return self::returnData($result, $type, true);
} }
/** /**
@@ -125,7 +125,7 @@ class Response
$view = new \think\View(); $view = new \think\View();
$result = $view->fetch(Config::get('dispatch_jump_tmpl'), $result); $result = $view->fetch(Config::get('dispatch_jump_tmpl'), $result);
} }
self::returnData($result, $type, true); return self::returnData($result, $type, true);
} }
/** /**
@@ -151,7 +151,7 @@ class Response
$view = new \think\View(); $view = new \think\View();
$result = $view->fetch(Config::get('dispatch_jump_tmpl'), $result); $result = $view->fetch(Config::get('dispatch_jump_tmpl'), $result);
} }
self::returnData($result, $type, true); return self::returnData($result, $type, true);
} }
/** /**