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

#119 board, forum, cafe 모듈 등이 포함되어 있을 때 설치 실패하는 문제 해결.

Browse source
This commit is contained in:
bnu 2013-12-04 20:18:51 +09:00
parent 7daa63cedf
commit 67bd8691d1
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
classes/db/DBMysql.class.php
View file

@ -582,11 +582,15 @@ class DBMysql extends DB
function _executeUpdateAct($queryObject, $with_values = true) function _executeUpdateAct($queryObject, $with_values = true)
{ {
$query = $this->getUpdateSql($queryObject, $with_values, true); $query = $this->getUpdateSql($queryObject, $with_values, true);
$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
if(is_a($query, 'Object')) if(is_a($query, 'Object'))
{ {
return; if(!$query->toBool()) return $query;
else return;
} }
$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
return $this->_query($query); return $this->_query($query);
} }

2
classes/db/queryparts/Query.class.php
View file

@ -402,6 +402,8 @@ class Query extends Object
$update[] = $column->getExpression($with_values); $update[] = $column->getExpression($with_values);
} }
} }
if(!$update) return;
return trim(implode($update, ', ')); return trim(implode($update, ', '));
} }

6
modules/module/module.controller.php
View file

@ -263,6 +263,12 @@ class moduleController extends module
$oModuleModel = &getModel('module'); $oModuleModel = &getModel('module');
$columnList = array('sites.site_srl', 'sites.domain'); $columnList = array('sites.site_srl', 'sites.domain');
$site_info = $oModuleModel->getSiteInfo($args->site_srl, $columnList); $site_info = $oModuleModel->getSiteInfo($args->site_srl, $columnList);
if(!$args->domain && $site_info->site_srl == $args->site_srl)
{
$args->domain = $site_info->domain;
}
if($site_info->domain != $args->domain) if($site_info->domain != $args->domain)
{ {
$info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList); $info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);