Commit a9a07be

committed

Fixed _registerAppModules() include_once issue

1 parent f4cb977 commit a9a07beCopy full SHA for a9a07be

File tree

1 file changed

+16

-14

lines changed

framework
- Apphp.php

1 file changed

+16

-14

lines changed

`‎framework/Apphp.php`

Lines changed: 16 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -1217,23 +1217,25 @@ protected function _registerAppHelpers()`
`1217`	`1217`	`*/`
`1218`	`1218`	`protected function _registerAppModules()`
`1219`	`1219`	`{`
`1220`		`-$modules = CConfig::get('modules');`
`1221`		`-if(!is_array($modules)) return false;`
	`1220`	`+$modules = CConfig::get('modules');`
	`1221`	`+if(!is_array($modules)) return false;`
`1222`	`1222`
`1223`		`- foreach ($modules as $id => $module) {`
`1224`		`- $enable = isset($module['enable']) ? (bool)$module['enable'] : false;`
`1225`		`- if ($enable) {`
`1226`		`- $moduleName = strtolower($id);`
`1227`		`- $moduleConfig = APPHP_PATH . DS . 'protected' . DS . 'modules' . DS . $moduleName . DS . 'config' . DS . 'main.php';`
`1228`		`- if (file_exists($moduleConfig)) {`
`1229`		`- $arrConfig = include_once($moduleConfig);`
`1230`		`- self::$_appModules[$moduleName] = $arrConfig;`
`1231`		`- }`
`1232`		`- }`
`1233`		`- }`
	`1223`	`+ foreach($modules as $id => $module){`
	`1224`	`+ $enable = isset($module['enable']) ? (bool)$module['enable'] : false;`
	`1225`	`+ if($enable){`
	`1226`	`+ $moduleName = strtolower($id);`
	`1227`	`+ $moduleConfig = APPHP_PATH.DS.'protected'.DS.'modules'.DS.$moduleName.DS.'config'.DS.'main.php';`
	`1228`	`+ if(file_exists($moduleConfig)){`
	`1229`	`+ $arrConfig = include($moduleConfig);`
	`1230`	`+ if (is_array($arrConfig)) {`
	`1231`	`+ self::$_appModules[$moduleName] = $arrConfig;`
	`1232`	`+ }`
	`1233`	`+ }`
	`1234`	`+ }`
	`1235`	`+ }`
	`1236`	`+`
`1234`	`1237`	`return true;`
`1235`	`1238`	`}`
`1236`		`-`
`1237`	`1239`	`}`
`1238`	`1240`
`1239`	`1241`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a9a07be

File tree

1 file changed

1 file changed

`‎framework/Apphp.php`

0 commit comments