From 9733c44ef3185c25cd84e12d7321156ca3f02933 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 26 Feb 2020 20:59:26 +0100 Subject: [PATCH] do not access SeedDMD_Document_Content::_version anymore use SeedDMD_Document_Content::getVersion() instead --- op/op.EditComment.php | 6 +++--- op/op.SetRecipients.php | 8 ++++---- op/op.SetRevisors.php | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/op/op.EditComment.php b/op/op.EditComment.php index 7dec214f7..38411ba97 100644 --- a/op/op.EditComment.php +++ b/op/op.EditComment.php @@ -72,14 +72,14 @@ if (($oldcomment = $version->getComment()) != $comment) { $folder = $document->getFolder(); /* - $subject = "###SITENAME###: ".$document->getName().", v.".$version->_version." - ".getMLText("document_comment_changed_email"); + $subject = "###SITENAME###: ".$document->getName().", v.".$version->getVersion()." - ".getMLText("document_comment_changed_email"); $message = getMLText("document_comment_changed_email")."\r\n"; $message .= getMLText("document").": ".$document->getName()."\r\n". - getMLText("version").": ".$version->_version."\r\n". + getMLText("version").": ".$version->getVersion()."\r\n". getMLText("comment").": ".$comment."\r\n". getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->_version."\r\n"; + "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->getVersion()."\r\n"; if(isset($document->_notifyList["users"])) { $notifier->toList($user, $document->_notifyList["users"], $subject, $message); diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php index 70e10450e..5ad1bca18 100644 --- a/op/op.SetRecipients.php +++ b/op/op.SetRecipients.php @@ -133,7 +133,7 @@ foreach ($pIndRev as $p) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['recipient'] = $accessIndex["i"][$p]->getFullName(); $params['username'] = $user->getFullName(); @@ -192,7 +192,7 @@ if (count($receiptIndex["i"]) > 0) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['recipient'] = $accessIndex["i"][$rx]->getFullName(); $params['username'] = $user->getFullName(); @@ -240,7 +240,7 @@ foreach ($pGrpRev as $p) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['recipient'] = $accessIndex["g"][$p]->getName(); $params['username'] = $user->getFullName(); @@ -295,7 +295,7 @@ if (count($receiptIndex["g"]) > 0) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['recipient'] = $accessIndex["g"][$rx]->getName(); $params['username'] = $user->getFullName(); diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php index 3c782d23f..56cff04d6 100644 --- a/op/op.SetRevisors.php +++ b/op/op.SetRevisors.php @@ -131,7 +131,7 @@ foreach ($pIndRev as $p) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['revisor'] = $accessIndex["i"][$p]->getFullName(); $params['username'] = $user->getFullName(); @@ -190,7 +190,7 @@ if (count($revisionIndex["i"]) > 0) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['revisor'] = $accessIndex["i"][$rx]->getFullName(); $params['username'] = $user->getFullName(); @@ -238,7 +238,7 @@ foreach ($pGrpRev as $p) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['revisor'] = $accessIndex["g"][$p]->getName(); $params['username'] = $user->getFullName(); @@ -293,7 +293,7 @@ if (count($revisionIndex["g"]) > 0) { $params = array(); $params['name'] = $document->getName(); $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $content->_version; + $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['revisor'] = $accessIndex["g"][$rx]->getName(); $params['username'] = $user->getFullName();