mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-02-11 17:44:56 +00:00
method which return content will return null if no content was found
false is only returned if an error occured
This commit is contained in:
parent
01e243e966
commit
2f9148e5b9
|
@ -1815,7 +1815,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
|
|||
if ($revision->getVersion() == $version)
|
||||
return $revision;
|
||||
}
|
||||
return false;
|
||||
return null;
|
||||
}
|
||||
|
||||
$db = $this->_dms->getDB();
|
||||
|
@ -1824,7 +1824,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
|
|||
if (is_bool($resArr) && !$resArr)
|
||||
return false;
|
||||
if (count($resArr) != 1)
|
||||
return false;
|
||||
return null;
|
||||
|
||||
$resArr = $resArr[0];
|
||||
$classname = $this->_dms->getClassname('documentcontent');
|
||||
|
@ -1833,7 +1833,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
|
|||
$user = $this->_dms->getLoggedInUser();
|
||||
/* A user with write access on the document may always see the version */
|
||||
if($user && $content->getAccessMode($user) == M_NONE)
|
||||
return false;
|
||||
return null;
|
||||
else
|
||||
return $content;
|
||||
} else {
|
||||
|
@ -2100,8 +2100,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
|
|||
|
||||
$queryStr = "SELECT * FROM `tblDocumentLinks` WHERE `document` = " . $this->_id ." AND `id` = " . (int) $linkID;
|
||||
$resArr = $db->getResultArray($queryStr);
|
||||
if ((is_bool($resArr) && !$resArr) || count($resArr)==0)
|
||||
if (is_bool($resArr) && !$resArr)
|
||||
return false;
|
||||
if (count($resArr)==0)
|
||||
return null;
|
||||
|
||||
$resArr = $resArr[0];
|
||||
$document = $this->_dms->getDocument($resArr["document"]);
|
||||
|
|
Loading…
Reference in New Issue
Block a user