gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-09 22:59:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge error

Browse Source
This commit is contained in:
Uwe Steinmann 2015-08-09 07:19:53 +02:00
parent 0ba67b2634
commit ec244587eb
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
utils/xmldump.php
View File

@ -283,15 +283,12 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
if($versions) { if($versions) {
echo $indent." <versions>\n"; echo $indent." <versions>\n";
foreach($versions as $version) { foreach($versions as $version) {
<<<<<<< HEAD
$approvalStatus = $version->getApprovalStatus(300); $approvalStatus = $version->getApprovalStatus(300);
$reviewStatus = $version->getReviewStatus(300); $reviewStatus = $version->getReviewStatus(300);
$receiptStatus = $version->getReceiptStatus(300); $receiptStatus = $version->getReceiptStatus(300);
$revisionStatus = $version->getRevisionStatus(300); $revisionStatus = $version->getRevisionStatus(300);
=======
$approvalStatus = $version->getApprovalStatus(30); $approvalStatus = $version->getApprovalStatus(30);
$reviewStatus = $version->getReviewStatus(30); $reviewStatus = $version->getReviewStatus(30);
>>>>>>> seeddms-5.0.x
$owner = $version->getUser(); $owner = $version->getUser();
echo $indent." <version version=\"".$version->getVersion()."\">\n"; echo $indent." <version version=\"".$version->getVersion()."\">\n";
echo $indent." <attr name=\"mimetype\">".$version->getMimeType()."</attr>\n"; echo $indent." <attr name=\"mimetype\">".$version->getMimeType()."</attr>\n";