From efa5ec4c0c561cf94d23fdfac30fc3d981dcb127 Mon Sep 17 00:00:00 2001 From: khongchi Date: Tue, 17 Dec 2013 20:51:00 +0900 Subject: [PATCH] =?UTF-8?q?NOISSUE=20PHP=20=EB=B2=84=EC=A0=84=20=ED=98=B8?= =?UTF-8?q?=ED=99=98=EC=84=B1=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/document/document.controller.php | 2 +- modules/document/document.model.php | 3 ++- modules/install/install.controller.php | 1 + modules/member/member.model.php | 2 +- modules/module/module.model.php | 5 +++-- widgets/content/content.class.php | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 65c5c9841..dcadf65c7 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -2230,7 +2230,7 @@ class documentController extends document if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl); else $module_srl = array($module_srl); - $document_config = null; + $document_config = new stdClass(); $document_config->use_history = Context::get('use_history'); if(!$document_config->use_history) $document_config->use_history = 'N'; diff --git a/modules/document/document.model.php b/modules/document/document.model.php index 3777d234d..167de6279 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -913,7 +913,8 @@ class documentModel extends document { $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('document'); - if(!$config) $config = new stdClass; + + if(!$config) $config = new stdClass(); if(!$config->thumbnail_type) $config->thumbnail_type = 'crop'; $GLOBALS['__document_config__'] = $config; } diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index b16394197..68f963c6c 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -240,6 +240,7 @@ class installController extends install if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/'; $buff = array(' $val) { $buff[] = sprintf("\$ftp_info->%s='%s';", $key, str_replace("'","\\'",$val)); diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 3361afe18..6d3d64147 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -815,7 +815,7 @@ class memberModel extends member if(file_exists($image_name_file)) { list($width, $height, $type, $attrs) = getimagesize($image_name_file); - $info = null; + $info = new stdClass(); $info->width = $width; $info->height = $height; $info->src = Context::getRequestUri().$image_name_file; diff --git a/modules/module/module.model.php b/modules/module/module.model.php index dc3ceb0b2..bcfb82d7c 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -641,11 +641,13 @@ class moduleModel extends module $xml_obj = $tmp_xml_obj->module; if(!$xml_obj) return; + // Module Information + $module_info = new stdClass(); + $author_obj = new stdClass(); if($xml_obj->version && $xml_obj->attrs->version == '0.2') { // module format 0.2 - $module_info = new stdClass(); $module_info->title = $xml_obj->title->body; $module_info->description = $xml_obj->description->body; $module_info->version = $xml_obj->version->body; @@ -662,7 +664,6 @@ 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; diff --git a/widgets/content/content.class.php b/widgets/content/content.class.php index 6bd50160d..0b11d5a59 100644 --- a/widgets/content/content.class.php +++ b/widgets/content/content.class.php @@ -63,10 +63,10 @@ class content extends WidgetHandler } else { + $obj = new stdClass(); // Apply to all modules in the site if a target module is not specified if(!$args->module_srls) { - $obj = new stdClass(); $obj->site_srl = (int)$site_module_info->site_srl; $output = executeQueryArray('widgets.content.getMids', $obj); if($output->data)