Merge pull request top-think#55 from dodgepudding/master

liu21st · liu21st · commit 8fdce196957e · 2013-05-26T19:27:46.000-07:00
修正普通分组模式下模块跨分组调用, 模板include跨分组路径错误bug
diff --git a/ThinkPHP/Lib/Behavior/LocationTemplateBehavior.class.php b/ThinkPHP/Lib/Behavior/LocationTemplateBehavior.class.php
@@ -40,11 +40,10 @@ private function parseTemplateFile($templateFile) {
             if(strpos($templateFile,'@')){
                 list($group,$templateFile) =    explode('@',$templateFile);
                 if(1==C('APP_GROUP_MODE')){
-                    $basePath   =   dirname(BASE_LIB_PATH).'/';
+                      $basePath   =   dirname(BASE_LIB_PATH).'/'.$group.'/'.basename(TMPL_PATH).'/'.(THEME_NAME?THEME_NAME.'/':'');
                 }else{
-                    $basePath   =   TMPL_PATH;
+                      $basePath   =   TMPL_PATH.'/'.$group.'/'.(THEME_NAME?THEME_NAME.'/':'');
                 }
-                $basePath  .=   $group.'/'.basename(TMPL_PATH).'/'.(THEME_NAME?THEME_NAME.'/':'');
             }else{
                 $basePath   =   THEME_PATH;
             }
diff --git a/ThinkPHP/Lib/Template/ThinkTemplate.class.php b/ThinkPHP/Lib/Template/ThinkTemplate.class.php
@@ -675,11 +675,10 @@ private function parseTemplateName($templateName){
                 if(strpos($templateName,'@')){
                     list($group,$templateName) =    explode('@',$templateName);
                     if(1==C('APP_GROUP_MODE')){
-                        $basePath   =   dirname(BASE_LIB_PATH).'/';
-                    }else{
-                        $basePath   =   TMPL_PATH;
-                    }
-                    $basePath  .=   $group.'/'.basename(TMPL_PATH).'/'.(THEME_NAME?THEME_NAME.'/':'');
+	                      $basePath   =   dirname(BASE_LIB_PATH).'/'.$group.'/'.basename(TMPL_PATH).'/'.(THEME_NAME?THEME_NAME.'/':'');
+	                }else{
+	                      $basePath   =   TMPL_PATH.'/'.$group.'/'.(THEME_NAME?THEME_NAME.'/':'');
+	                }
                 }else{
                     $basePath   =   THEME_PATH;
                 }

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,10 @@ private function parseTemplateFile($templateFile) {`
`40`	`40`	`if(strpos($templateFile,'@')){`
`41`	`41`	`list($group,$templateFile) = explode('@',$templateFile);`
`42`	`42`	`if(1==C('APP_GROUP_MODE')){`
`43`		`- $basePath = dirname(BASE_LIB_PATH).'/';`
	`43`	`+ $basePath = dirname(BASE_LIB_PATH).'/'.$group.'/'.basename(TMPL_PATH).'/'.(THEME_NAME?THEME_NAME.'/':'');`
`44`	`44`	`}else{`
`45`		`- $basePath = TMPL_PATH;`
	`45`	`+ $basePath = TMPL_PATH.'/'.$group.'/'.(THEME_NAME?THEME_NAME.'/':'');`
`46`	`46`	`}`
`47`		`- $basePath .= $group.'/'.basename(TMPL_PATH).'/'.(THEME_NAME?THEME_NAME.'/':'');`
`48`	`47`	`}else{`
`49`	`48`	`$basePath = THEME_PATH;`
`50`	`49`	`}`