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

Controll更改为Controller

Browse Source
This commit is contained in:
thinkphp
2013-03-13 17:46:03 +08:00
parent 4b739dabd7
commit 7b1541e1f8
8 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Think/Loader.php
View File

@@ -168,8 +168,8 @@ class Loader {
* @param string $layer 控制层名称
* @return Action|false
*/
static public function controll($name,$layer='') {
$layer = $layer?$layer:'Controll';
static public function controller($name,$layer='') {
$layer = $layer?$layer:'Controller';
static $_instance = [];
if(isset($_instance[$name.$layer])) return $_instance[$name.$layer];
if(strpos($name,'/')) {
@@ -207,8 +207,8 @@ class Loader {
static public function action($url,$vars=[],$layer='') {
$info = pathinfo($url);
$action = $info['basename'];
$module = '.' != $info['dirname']?$info['dirname']:CONTROLL_NAME;
$class = self::controll($module,$layer);
$module = '.' != $info['dirname']?$info['dirname']:CONTROLLER_NAME;
$class = self::controller($module,$layer);
if($class){
if(is_string($vars)) {
parse_str($vars,$vars);