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

Merge branch 'master' of https://github.com/top-think/think

Browse Source
This commit is contained in:
thinkphp
2016-03-14 14:03:10 +08:00
parent 06ba891ca4 78f7433f51
commit 8affa2aed4
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Controller.php
View File

@@ -11,7 +11,7 @@
namespace think; namespace think;
T('controller/Jump'); \think\Loader::import('controller/Jump', TRAIT_PATH, EXT);
class Controller class Controller
{ {

4
library/think/model/Adv.php
View File

@@ -11,8 +11,8 @@
namespace think\model; namespace think\model;
T('model/Adv'); \think\Loader::import('model/Adv', TRAIT_PATH, EXT);
T('model/Transaction'); \think\Loader::import('model/Transaction', TRAIT_PATH, EXT);
class Adv extends \think\Model class Adv extends \think\Model
{ {

2
library/think/model/Mongo.php
View File

@@ -13,7 +13,7 @@ namespace think\model;
use think\Lang; use think\Lang;
use think\Loader; use think\Loader;
T('modle/Adv'); \think\Loader::import('modle/Adv', TRAIT_PATH, EXT);
/** /**
* MongoModel模型类 * MongoModel模型类

3
library/think/model/Relation.php
View File

@@ -11,7 +11,8 @@
namespace think\model; namespace think\model;
T('model/Relation'); \think\Loader::import('model/Relation', TRAIT_PATH, EXT);
class Relation extends \think\Model class Relation extends \think\Model
{ {
use \traits\model\Relation; use \traits\model\Relation;

3
library/think/model/View.php
View File

@@ -11,7 +11,8 @@
namespace think\model; namespace think\model;
T('model/View'); \think\Loader::import('model/View', TRAIT_PATH, EXT);
class View extends \think\Model class View extends \think\Model
{ {
use \traits\model\View; use \traits\model\View;