diff --git a/helper.php b/helper.php index d3199031..b45cb486 100644 --- a/helper.php +++ b/helper.php @@ -72,11 +72,11 @@ function G($start, $end = '', $dec = 6) /** * 实例化一个没有模型文件的Model * @param string $name Model名称 支持指定基础模型 例如 MongoModel:User - * @param string $tablePrefix 表前缀 + * @param string|null $tablePrefix 表前缀 null表示自动获取配置 * @param mixed $connection 数据库连接信息 * @return \Think\Model */ -function M($name = '', $tablePrefix = '', $connection = '') +function M($name = '', $tablePrefix = null, $connection = '') { return \think\Loader::table($name, ['prefix' => $tablePrefix, 'connection' => $connection]); } diff --git a/library/think/Model.php b/library/think/Model.php index 225257d8..77ef71fa 100644 --- a/library/think/Model.php +++ b/library/think/Model.php @@ -76,6 +76,8 @@ class Model if (!empty($config['prefix'])) { $this->tablePrefix = $config['prefix']; + } elseif ('' === $config['prefix']) { + $this->tablePrefix = ''; } elseif (is_null($this->tablePrefix)) { $this->tablePrefix = Config::get('database.prefix'); }