fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-12 07:11:42 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1 from xpressengine/develop

Browse source 
Develop
This commit is contained in:
퍼니엑스이 2014-02-11 17:58:34 +09:00
commit 7e6bf6fb44
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/admin/admin.admin.model.php
View file

@ -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,7 @@ class adminAdminModel extends admin
$info['widget'] = "";
$oWidgetModel = getModel('widget');
$widget_list = $oWidgetModel->getDownloadedWidgetList();
foreach($widget_list as $widget)
if($widget_list) foreach($widget_list as $widget)
{
if(in_array($widget->widget, $skip['widget']))
{
@ -402,7 +402,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']))
{

3
modules/member/member.admin.controller.php
View file

@ -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);

2
modules/module/module.model.php
View file

@ -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;