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

Session驱动的扩展定义方式改变 采用SessionHandler机制

Browse Source 
Model类的架构方法 参数调整
This commit is contained in:
thinkphp
2013-04-09 21:29:32 +08:00
parent 279ce15d21
commit 15a45e9ff7
8 changed files with 75 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Think/Loader.php
View File

@@ -18,6 +18,7 @@ class Loader {
static protected $namespace = [
'Think' => CORE_PATH,
'Vendor' => VENDOR_PATH,
'Library' => LIB_PATH,
];
// 自动加载
@@ -118,7 +119,7 @@ class Loader {
}
$guid = $tablePrefix . $name . '_' . $class;
if (!isset($_model[$guid]))
$_model[$guid] = new $class($name,$tablePrefix,$connection);
$_model[$guid] = new $class($name,['table_prefix'=>$tablePrefix,'connection'=>$connection]);
return $_model[$guid];
}
@@ -129,7 +130,7 @@ class Loader {
* @return Object
*/
static public function model($name='',$layer='Model') {
if(empty($name)) return new Model;
if(empty($name)) return new Think\Model;
static $_model = [];
if(isset($_model[$name.$layer])) return $_model[$name.$layer];
if(strpos($name,'/')) {
@@ -141,14 +142,14 @@ class Loader {
if(class_exists($class)) {
$model = new $class($name);
}else {
$model = new Model($name);
$model = new Think\Model($name);
}
$_model[$name.$layer] = $model;
return $model;
}
/**
* 实例化（分层）控制器 格式：[分组/]模块
* 实例化（分层）控制器 格式：[模块名/]控制器名
* @param string $name 资源地址
* @param string $layer 控制层名称
* @return Action|false