merge & tag 1.4.3

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7597 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2010-07-06 08:29:10 +00:00
parent 762ebbf445
commit 289973781a
200 changed files with 2296 additions and 1827 deletions

View file

@ -358,7 +358,6 @@
**/
function triggerBeforeDownloadFile(&$obj) {
$logged_info = Context::get('logged_info');
if(!$logged_info->member_srl) return new Object();
$member_srl = $logged_info->member_srl;
$module_srl = $obj->module_srl;
if(!$module_srl) return new Object();
@ -371,7 +370,11 @@
$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
// 포인트가 없으면 다운로드가 안되도록 하였으면 비로그인 회원일 경우 중지
if(!Context::get('is_logged') && $config->disable_download == 'Y') return new Object(-1,'msg_not_permitted_download');
if(!Context::get('is_logged'))
{
if($config->disable_download == 'Y') return new Object(-1,'msg_not_permitted_download');
else return new Object();
}
// 대상 회원의 포인트를 구함
$oPointModel = &getModel('point');