fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 19:21:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Guard some count() calls with is_array() in install module

Browse source
This commit is contained in:
Kijin Sung 2017-12-09 02:23:22 +09:00
parent ebcf19b9ec
commit 2d6bde8f8c
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/install/install.controller.php
View file

@ -450,6 +450,7 @@ class installController extends install
$oModuleModel = getModel('module'); $oModuleModel = getModel('module');
// Create a table ny finding schemas/*.xml file in each module // Create a table ny finding schemas/*.xml file in each module
$module_list = FileHandler::readDir('./modules/', NULL, false, true); $module_list = FileHandler::readDir('./modules/', NULL, false, true);
$modules = array();
foreach($module_list as $module_path) foreach($module_list as $module_path)
{ {
// Get module name // Get module name
@ -467,7 +468,7 @@ class installController extends install
// Install all the remaining modules // Install all the remaining modules
foreach($install_step as $category) foreach($install_step as $category)
{ {
if(count($modules[$category])) if(is_array($modules[$category]) && count($modules[$category]))
{ {
foreach($modules[$category] as $module) foreach($modules[$category] as $module)
{ {
@ -488,7 +489,7 @@ class installController extends install
{ {
foreach($modules as $category => $module_list) foreach($modules as $category => $module_list)
{ {
if(count($module_list)) if(is_array($module_list) && count($module_list))
{ {
foreach($module_list as $module) foreach($module_list as $module)
{ {