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

reverse merge from 1.6.0 (r10052)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10699 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-16 09:47:22 +00:00
parent c6c3fdcf12
commit 6ab58529f8
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/document/document.model.php
View file

@ -104,10 +104,11 @@
function getDocument($document_srl=0, $is_admin = false, $load_extra_vars=true, $columnList = array()) { function getDocument($document_srl=0, $is_admin = false, $load_extra_vars=true, $columnList = array()) {
if(!$document_srl) return new documentItem(); if(!$document_srl) return new documentItem();
if(!isset($GLOBALS['XE_DOCUMENT_LIST'][$document_srl])) { if(!isset($GLOBALS['XE_DOCUMENT_LIST'][$document_srl]) || $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->columnListKey != serialize($columnList)) {
$oDocument = new documentItem($document_srl, $load_extra_vars, $columnList); $oDocument = new documentItem($document_srl, $load_extra_vars, $columnList);
$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument; $GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
if($load_extra_vars) $this->setToAllDocumentExtraVars(); if($load_extra_vars) $this->setToAllDocumentExtraVars();
$GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->columnListKey = serialize($columnList);
} }
if($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant(); if($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();