mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-12-27 23:38:28 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
8bb4f80032
|
|
@ -56,7 +56,8 @@ class RestapiController { /* {{{ */
|
|||
'name'=>$document->getName(),
|
||||
'comment'=>$document->getComment(),
|
||||
'keywords'=>$document->getKeywords(),
|
||||
'categories'=>$tmp
|
||||
'categories'=>$tmp,
|
||||
'owner'=>(int)$document->getOwner()->getId()
|
||||
);
|
||||
return $data;
|
||||
} /* }}} */
|
||||
|
|
@ -142,6 +143,7 @@ class RestapiController { /* {{{ */
|
|||
'name'=>$folder->getName(),
|
||||
'comment'=>$folder->getComment(),
|
||||
'date'=>date('Y-m-d H:i:s', $folder->getDate()),
|
||||
'owner'=>(int)$folder->getOwner()->getId()
|
||||
);
|
||||
$attributes = $this->__getAttributesData($folder);
|
||||
if($attributes) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user