gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +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-02-21 06:16:32 +01:00
commit 7fc7ffd708
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SeedDMS_Core/package.xml
View File

@ -1356,5 +1356,21 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
- all changes till 5.0.6 merged - all changes till 5.0.6 merged
</notes> </notes>
</release> </release>
<release>
<date>2017-02-20</date>
<time>06:23:34</time>
<version>
<release>5.0.10</release>
<api>5.0.10</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- all changes from 4.3.33 merged
</notes>
</release>
</changelog> </changelog>
</package> </package>

2
utils/xmldump.php
View File

@ -419,6 +419,8 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
echo $indent." <attr name=\"mimetype\">".$file->getMimeType()."</attr>\n"; echo $indent." <attr name=\"mimetype\">".$file->getMimeType()."</attr>\n";
echo $indent." <attr name=\"date\" format=\"Y-m-d H:i:s\">".date('Y-m-d H:i:s', $file->getDate())."</attr>\n"; echo $indent." <attr name=\"date\" format=\"Y-m-d H:i:s\">".date('Y-m-d H:i:s', $file->getDate())."</attr>\n";
echo $indent." <attr name=\"filetype\">".wrapWithCData($file->getFileType())."</attr>\n"; echo $indent." <attr name=\"filetype\">".wrapWithCData($file->getFileType())."</attr>\n";
echo $indent." <attr name=\"version\">".$file->getVersion()."</attr>\n";
echo $indent." <attr name=\"pulic\">".($file->isPublic() ? 1 : 0)."</attr>\n";
echo $indent." <attr name=\"owner\">".$owner->getId()."</attr>\n"; echo $indent." <attr name=\"owner\">".$owner->getId()."</attr>\n";
echo $indent." <attr name=\"comment\">".wrapWithCData($file->getComment())."</attr>\n"; echo $indent." <attr name=\"comment\">".wrapWithCData($file->getComment())."</attr>\n";
echo $indent." <attr name=\"orgfilename\">".wrapWithCData($file->getOriginalFileName())."</attr>\n"; echo $indent." <attr name=\"orgfilename\">".wrapWithCData($file->getOriginalFileName())."</attr>\n";