From 6024868c602b157c6f03a182e0f000da348ed3ba Mon Sep 17 00:00:00 2001 From: akasima Date: Mon, 10 Feb 2014 10:34:50 +0900 Subject: [PATCH 1/4] =?UTF-8?q?#451=20getEnv=20=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=EC=B2=B4=ED=81=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/admin/admin.admin.model.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index 5e544903a..600a74fad 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -350,7 +350,7 @@ class adminAdminModel extends admin $info['module'] = ''; $oModuleModel = getModel('module'); $module_list = $oModuleModel->getModuleList(); - foreach($module_list as $module) + if($module_list) foreach($module_list as $module) { if(in_array($module->module, $skip['module'])) { @@ -363,7 +363,7 @@ class adminAdminModel extends admin $info['addon'] = ''; $oAddonAdminModel = getAdminModel('addon'); $addon_list = $oAddonAdminModel->getAddonList(); - foreach($addon_list as $addon) + if($addon_list) foreach($addon_list as $addon) { if(in_array($addon->addon, $skip['addon'])) { @@ -376,7 +376,7 @@ class adminAdminModel extends admin $info['layout'] = ""; $oLayoutModel = getModel('layout'); $layout_list = $oLayoutModel->getDownloadedLayoutList(); - foreach($layout_list as $layout) + if($layout_list) foreach($layout_list as $layout) { if(in_array($layout->layout, $skip['layout'])) { @@ -389,7 +389,8 @@ class adminAdminModel extends admin $info['widget'] = ""; $oWidgetModel = getModel('widget'); $widget_list = $oWidgetModel->getDownloadedWidgetList(); - foreach($widget_list as $widget) + $widget_list = NULL; + if($widget_list) foreach($widget_list as $widget) { if(in_array($widget->widget, $skip['widget'])) { @@ -402,7 +403,7 @@ class adminAdminModel extends admin $info['widgetstyle'] = ""; $oWidgetModel = getModel('widget'); $widgetstyle_list = $oWidgetModel->getDownloadedWidgetStyleList(); - foreach($widgetstyle_list as $widgetstyle) + if($widgetstyle_list) foreach($widgetstyle_list as $widgetstyle) { if(in_array($widgetstyle->widgetStyle, $skip['widgetstyle'])) { From d9f393d556138e09f7d7f15b64da60c86b8bda3a Mon Sep 17 00:00:00 2001 From: akasima Date: Mon, 10 Feb 2014 10:40:21 +0900 Subject: [PATCH 2/4] =?UTF-8?q?#451=20getEnv=20=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=EC=B2=B4=ED=81=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/admin/admin.admin.model.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index 600a74fad..d0c69a80d 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -389,7 +389,6 @@ class adminAdminModel extends admin $info['widget'] = ""; $oWidgetModel = getModel('widget'); $widget_list = $oWidgetModel->getDownloadedWidgetList(); - $widget_list = NULL; if($widget_list) foreach($widget_list as $widget) { if(in_array($widget->widget, $skip['widget'])) From 98b8296be0ba1c52c4c6cb696cec209cb672454b Mon Sep 17 00:00:00 2001 From: akasima Date: Mon, 10 Feb 2014 15:54:04 +0900 Subject: [PATCH 3/4] =?UTF-8?q?#458=20extra=5Fvars=EC=97=90=20=EB=B9=84?= =?UTF-8?q?=EB=B0=80=EB=B2=88=ED=98=B8=20=EC=9E=85=EB=A0=A5=EB=90=A8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/member/member.admin.controller.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index 70202c1aa..9305d6ae0 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -61,6 +61,9 @@ class memberAdminController extends member unset($all_args->success_return_url); unset($all_args->ruleset); if(!isset($args->limit_date)) $args->limit_date = ""; + unset($all_args->password); + unset($all_args->password2); + unset($all_args->reset_password); // Add extra vars after excluding necessary information from all the requested arguments $extra_vars = delObjectVars($all_args, $args); $args->extra_vars = serialize($extra_vars); From 22f1019abe96e8da980d36f0a4bb25a1a90d38fb Mon Sep 17 00:00:00 2001 From: akasima Date: Mon, 10 Feb 2014 16:12:47 +0900 Subject: [PATCH 4/4] =?UTF-8?q?#446=20author=20=EA=B0=80=20=EB=91=90?= =?UTF-8?q?=EB=AA=85=20=EC=9D=B4=EC=83=81=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/module/module.model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/module/module.model.php b/modules/module/module.model.php index 9ad09f733..f2c42543e 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -746,7 +746,6 @@ class moduleModel extends module // Module Information $module_info = new stdClass(); - $author_obj = new stdClass(); if($xml_obj->version && $xml_obj->attrs->version == '0.2') { // module format 0.2 @@ -766,6 +765,7 @@ class moduleModel extends module foreach($author_list as $author) { + $author_obj = new stdClass(); $author_obj->name = $author->name->body; $author_obj->email_address = $author->attrs->email_address; $author_obj->homepage = $author->attrs->link;