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

Merge pull request #378 from smaker/php54

Browse source 
PHP 5.4에서 발생하는 호환성 문제 수정
This commit is contained in:
sungbum hong 2014-01-28 02:04:44 -08:00
commit 6a1614f396
5 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/addon/addon.admin.model.php
View file

@ -255,7 +255,16 @@ class addonAdminModel extends addon
foreach($extra_vars as $key => $val) foreach($extra_vars as $key => $val)
{ {
if(!$val)
{
continue;
}
$obj = new stdClass(); $obj = new stdClass();
if(!$val->attrs)
{
$val->attrs = new stdClass();
}
if(!$val->attrs->type) if(!$val->attrs->type)
{ {
$val->attrs->type = 'text'; $val->attrs->type = 'text';
@ -341,6 +350,11 @@ class addonAdminModel extends addon
$addon_info->extra_vars = array(); $addon_info->extra_vars = array();
foreach($extra_vars as $key => $val) foreach($extra_vars as $key => $val)
{ {
if(!$val)
{
continue;
}
$obj = new stdClass(); $obj = new stdClass();
$obj->group = $group->title->body; $obj->group = $group->title->body;

2
modules/install/install.admin.controller.php
View file

@ -196,7 +196,7 @@ class installAdminController extends install
$ftp_info->ftp_password = Context::get('ftp_password'); $ftp_info->ftp_password = Context::get('ftp_password');
} }
$buff = '<?php if(!defined("__XE__")) exit();'."\n"; $buff = '<?php if(!defined("__XE__")) exit();'."\n\$ftp_info = new stdClass;\n";
foreach($ftp_info as $key => $val) foreach($ftp_info as $key => $val)
{ {
if(!$val) continue; if(!$val) continue;

1
modules/member/member.model.php
View file

@ -892,6 +892,7 @@ class memberModel extends member
if(file_exists($image_name_file)) if(file_exists($image_name_file))
{ {
list($width, $height, $type, $attrs) = getimagesize($image_name_file); list($width, $height, $type, $attrs) = getimagesize($image_name_file);
$info = new stdClass;
$info->width = $width; $info->width = $width;
$info->height = $height; $info->height = $height;
$info->src = Context::getRequestUri().$image_name_file; $info->src = Context::getRequestUri().$image_name_file;

1
modules/menu/menu.mobile.php
View file

@ -23,6 +23,7 @@ class menuMobile extends moduleObject
function straightenMenu($menu_item, $depth) function straightenMenu($menu_item, $depth)
{ {
if(!$menu_item['link']) return; if(!$menu_item['link']) return;
$obj = new stdClass;
$obj->href = $menu_item['href']; $obj->href = $menu_item['href'];
$obj->depth = $depth; $obj->depth = $depth;
$obj->text = $menu_item['text']; $obj->text = $menu_item['text'];

1
modules/widget/widget.controller.php
View file

@ -667,6 +667,7 @@ class widgetController extends widget
$widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetStyle); $widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetStyle);
if(!$widgetstyle_info) return $widget_content_body; if(!$widgetstyle_info) return $widget_content_body;
$widgetstyle_extra_var = new stdClass();
$widgetstyle_extra_var_key = get_object_vars($widgetstyle_info); $widgetstyle_extra_var_key = get_object_vars($widgetstyle_info);
if(count($widgetstyle_extra_var_key['extra_var'])) if(count($widgetstyle_extra_var_key['extra_var']))
{ {