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

merge & tag 1.4.3

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

18
modules/document/document.controller.php
View file

@ -185,6 +185,10 @@
// 내용에서 XE만의 태그를 삭제
$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
if(Mobile::isFromMobilePhone())
{
$obj->content = nl2br(htmlspecialchars($obj->content));
}
// 세션에서 최고 관리자가 아니면 iframe, script 제거
if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
@ -481,6 +485,7 @@
$oDocument = $oDocumentModel->getDocument($obj->document_srl);
$trash_args->module_srl = $oDocument->get('module_srl');
$obj->module_srl = $oDocument->get('module_srl');
// 휴지통 문서를 두번 휴지통에 버릴 수 없음.
if($trash_args->module_srl == 0) return false;
@ -531,7 +536,16 @@
executeQuery('file.updateFileValid', $args);
}
// commit
// trigger 호출 (after)
if($output->toBool()) {
$trigger_output = ModuleHandler::triggerCall('document.moveDocumentToTrash', 'after', $obj);
if(!$trigger_output->toBool()) {
$oDB->rollback();
return $trigger_output;
}
}
// commit
$oDB->commit();
return $output;
@ -1621,7 +1635,7 @@
$document_config = null;
$document_config->use_history = Context::get('use_history');
if(!$document_config->use_history) $document_config->user_history = 'N';
if(!$document_config->use_history) $document_config->use_history = 'N';
$oModuleController = &getController('module');
for($i=0;$i<count($module_srl);$i++) {