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

修正

Browse Source
This commit is contained in:
thinkphp
2015-12-08 10:56:47 +08:00
parent 0c6a768456
commit 788aeb686c
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/app.php
View File

@@ -57,8 +57,8 @@ class App
Session::init($config['session']);
}
//判断，如果启动SocketLog调试， 进行SocketLog配置
if($config['slog']['enable']) {
slog::config($config['slog']);
if ($config['slog']['enable']) {
\org\Slog::config($config['slog']);
}
// 应用URL调度

9
library/think/db/driver.php
View File

@@ -17,7 +17,6 @@ use think\Debug;
use think\Exception;
use think\Lang;
use think\Log;
use think\Slog;
abstract class Driver
{
@@ -743,7 +742,7 @@ abstract class Driver
protected function parseOrder($order)
{
$array = [];
if(is_array($order)) {
if (is_array($order)) {
foreach ($order as $key => $val) {
if (is_numeric($key)) {
if (false === strpos($val, '(')) {
@@ -1163,9 +1162,9 @@ abstract class Driver
}
}
$slog_config=Config::get('slog');
if($slog_config['enable'] && $start) {
slog::sql($this->queryStr,$this->_linkID);
$slog_config = Config::get('slog');
if ($slog_config['enable'] && $start) {
\org\Slog::sql($this->queryStr, $this->_linkID);
}
}