mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-08 19:21:40 +09:00
issue 825, remove check globals in DocumentModel::getDocument()
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10332 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
5d2d1d3c6e
commit
5e075dac43
1 changed files with 3 additions and 5 deletions
|
|
@ -104,11 +104,9 @@
|
|||
function getDocument($document_srl=0, $is_admin = false, $load_extra_vars=true, $columnList = array()) {
|
||||
if(!$document_srl) return new documentItem();
|
||||
|
||||
if(!isset($GLOBALS['XE_DOCUMENT_LIST'][$document_srl])) {
|
||||
$oDocument = new documentItem($document_srl, $load_extra_vars, $columnList);
|
||||
$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
|
||||
if($load_extra_vars) $this->setToAllDocumentExtraVars();
|
||||
}
|
||||
$oDocument = new documentItem($document_srl, $load_extra_vars, $columnList);
|
||||
$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
|
||||
if($load_extra_vars && !$GLOBALS['XE_EXTRA_VARS'][$document_srl]) $this->setToAllDocumentExtraVars();
|
||||
if($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
|
||||
|
||||
return $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue