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

改进一处 错误

Browse Source
This commit is contained in:
thinkphp
2016-04-27 16:49:36 +08:00
parent 00cd2e61d9
commit 0b104d2b49
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -853,7 +853,9 @@ class Query
{ {
if (empty($this->options['table'])) { if (empty($this->options['table'])) {
$tableName = $this->connection->getConfig('prefix'); $tableName = $this->connection->getConfig('prefix');
$tableName .= Loader::parseName($this->options['name']); if (isset($this->options['name'])) {
$tableName .= Loader::parseName($this->options['name']);
}
} else { } else {
$tableName = $this->options['table']; $tableName = $this->options['table'];
} }

5
library/traits/think/Instance.php
View File

@@ -15,7 +15,10 @@ trait Instance
{ {
protected static $instance = null; protected static $instance = null;
// 实例化（单例） /**
* @param array $options
* @return static
*/
public static function instance($options = []) public static function instance($options = [])
{ {
if (is_null(self::$instance)) { if (is_null(self::$instance)) {