Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Lastorder 2025-12-24 03:07:48 +00:00
commit 881b0fbac1
58 changed files with 606 additions and 200 deletions

View file

@ -149,10 +149,10 @@ class DocumentModel extends Document
* @param int $document_srl
* @param bool $is_admin
* @param bool $load_extra_vars
* @param array $columnList
* @param bool $reload_counts
* @return documentItem
*/
public static function getDocument($document_srl = 0, $is_admin = false, $load_extra_vars = true, $columnList = array())
public static function getDocument($document_srl = 0, $is_admin = false, $load_extra_vars = true, $reload_counts = true)
{
if(!$document_srl)
{
@ -160,7 +160,7 @@ class DocumentModel extends Document
}
if(!isset($GLOBALS['XE_DOCUMENT_LIST'][$document_srl]))
{
$oDocument = new documentItem($document_srl, $load_extra_vars, $columnList);
$oDocument = new documentItem($document_srl, $load_extra_vars, $reload_counts);
if(!$oDocument->isExists())
{
return $oDocument;