diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index d883d33d6..51e7b21d9 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -324,30 +324,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ return null; $resArr = $resArr[0]; - // New Locking mechanism uses a separate table to track the lock. - /* - $queryStr = "SELECT * FROM `tblDocumentLocks` WHERE `document` = " . (int) $id; - $lockArr = $db->getResultArray($queryStr); - if ((is_bool($lockArr) && $lockArr==false) || (count($lockArr)==0)) { - // Could not find a lock on the selected document. - $resArr['lock'] = -1; - } - else { - // A lock has been identified for this document. - $resArr['lock'] = $lockArr[0]["userID"]; - } -*/ $resArr['lock'] = !$resArr['lock'] ? -1 : $resArr['lock']; -// print_r($resArr);exit; return self::getInstanceByData($resArr, $dms); - - $classname = $dms->getClassname('document'); - /** @var SeedDMS_Core_Document $document */ - $document = new $classname($resArr["id"], $resArr["name"], $resArr["comment"], $resArr["date"], $resArr["expires"], $resArr["owner"], $resArr["folder"], $resArr["inheritAccess"], $resArr["defaultAccess"], $resArr['lock'], $resArr["keywords"], $resArr["sequence"]); - $document->setDMS($dms); - $document = $document->applyDecorators(); - return $document; } /* }}} */ /**