gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 12:41:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2017-12-21 15:27:33 +01:00
commit 3cd766468d
3 changed files with 1509 additions and 1178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SeedDMS_Core/Core/inc.ClassDocument.php
View File

@ -2204,7 +2204,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
$link = new SeedDMS_Core_DocumentLink($resArr["id"], $document, $target, $resArr["userID"], $resArr["public"]); $link = new SeedDMS_Core_DocumentLink($resArr["id"], $document, $target, $resArr["userID"], $resArr["public"]);
$user = $this->_dms->getLoggedInUser(); $user = $this->_dms->getLoggedInUser();
if($link->getAccessMode($user, $document, $target) >= M_READ) if($link->getAccessMode($user, $document, $target) >= M_READ)
return $file; return $link;
return null; return null;
} /* }}} */ } /* }}} */

580
languages/nl_NL/lang.inc
View File

File diff suppressed because it is too large Load Diff

2003
restapi/index.php
View File

File diff suppressed because it is too large Load Diff