From e239d46f1c1e89d55e0f7f3c2e7be343c6e39207 Mon Sep 17 00:00:00 2001 From: flyskyko Date: Tue, 6 Sep 2011 09:13:18 +0000 Subject: [PATCH] fixed foreach warning git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9052 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/module/module.admin.view.php | 32 +++++++++++++++------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php index 67ce5620a..863d73a4b 100644 --- a/modules/module/module.admin.view.php +++ b/modules/module/module.admin.view.php @@ -25,30 +25,32 @@ /** * @brief Display a lost of modules **/ - function dispModuleAdminList() { + function dispModuleAdminList() { // Obtain a list of modules $oAdminModel = &getAdminModel('admin'); - $oModuleModel = &getModel('module'); + $oModuleModel = &getModel('module'); $oAutoinstallModel = &getModel('autoinstall'); - + $module_list = $oModuleModel->getModuleList(); - foreach($module_list as $key => $val) { - $val->delete_url = $oAutoinstallModel->getRemoveUrlByPath($val->path); + foreach($module_list as $key => $val) { + $val->delete_url = $oAutoinstallModel->getRemoveUrlByPath($val->path); } - + $output = $oAdminModel->getFavoriteList('0'); - - $favoriteList = $output->variables['favoriteList']; + + $favoriteList = $output->get('favoriteList'); $favoriteModuleList = array(); - foreach($favoriteList as $favorite => $favorite_info){ - $favoriteModuleList[] = $favorite_info->module; + if ($favoriteList){ + foreach($favoriteList as $favorite => $favorite_info){ + $favoriteModuleList[] = $favorite_info->module; + } } - + Context::set('favoriteModuleList', $favoriteModuleList); - Context::set('module_list', $module_list); - // Set a template file + Context::set('module_list', $module_list); + // Set a template file $this->setTemplateFile('spInstalledModule'); - + } /** @@ -70,7 +72,7 @@ **/ function dispModuleAdminCategory() { $module_category_srl = Context::get('module_category_srl'); - + // Obtain a list of modules $oModuleModel = &getModel('module'); // Display the category page if a category is selected