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

取消驱动配置的namespace参数

Browse Source
This commit is contained in:
thinkphp
2016-06-18 23:42:16 +08:00
parent 20eaa4f5b8
commit 30cec3abb1
11 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/db/Connection.php
View File

@@ -284,7 +284,7 @@ abstract class Connection
if ($this->linkID) {
return $this->linkID->getAttribute(PDO::ATTR_DRIVER_NAME);
} else {
return $this->config['type'];
return basename(str_replace('\\', '/', $this->config['type']));
}
}

2
library/think/db/Query.php
View File

@@ -960,7 +960,7 @@ class Query
{
$config = array_merge(Config::get('paginate'), $config);
$listRows = $listRows ?: $config['list_rows'];
$class = (!empty($config['namespace']) ? $config['namespace'] : '\\think\\paginator\\driver\\') . ucwords($config['type']);
$class = strpos($config['type'], '\\') ? $config['type'] : '\\think\\paginator\\driver\\') . ucwords($config['type']);
$page = isset($config['page']) ? (int) $config['page'] : call_user_func([
$class,
'getCurrentPage',