mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-08 20:46:05 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
28e01b577a
|
@ -1054,6 +1054,7 @@ final class SeedDMS_RestapiController { /* {{{ */
|
|||
if ($mfolder->getAccessMode($userobj, 'addDocument') >= M_READWRITE) {
|
||||
$params = $request->getQueryParams();
|
||||
$docname = isset($params['name']) ? $params['name'] : '';
|
||||
$comment = isset($params['comment']) ? $params['comment'] : '';
|
||||
$keywords = isset($params['keywords']) ? $params['keywords'] : '';
|
||||
$origfilename = isset($params['origfilename']) ? $params['origfilename'] : null;
|
||||
$content = $request->getBody();
|
||||
|
@ -1071,7 +1072,7 @@ final class SeedDMS_RestapiController { /* {{{ */
|
|||
return $this->renderer->json($response, array('success'=>false, 'message'=>getMLText("document_duplicate_name"), 'data'=>''))->withStatus(409);
|
||||
}
|
||||
}
|
||||
$res = $mfolder->addDocument($docname, '', 0, $userobj, '', array(), $temp, $origfilename ? $origfilename : basename($temp), $fileType, $userfiletype, 0);
|
||||
$res = $mfolder->addDocument($docname, $comment, 0, $userobj, '', array(), $temp, $origfilename ? $origfilename : basename($temp), $fileType, $userfiletype, 0);
|
||||
unlink($temp);
|
||||
if($res) {
|
||||
$doc = $res[0];
|
||||
|
|
Loading…
Reference in New Issue
Block a user