Merge branch '4.7.0.2' of github.com:opus4/application into 4.7.0.2

j3nsch · j3nsch · commit f925f9757219 · 2020-09-03T12:31:38.000+02:00
diff --git a/modules/publish/models/FormElement.php b/modules/publish/models/FormElement.php
@@ -571,7 +571,7 @@ public function getCollectionRole()
     public function setCurrentCollectionId($setRoot = false)
     {
         if (! $setRoot) {
-            $collectionRole = Opus_CollectionRole::fetchByOaiName($this->_collectionRole);
+            $collectionRole = Opus_CollectionRole::fetchByName($this->_collectionRole);
             if (! is_null($collectionRole)) {
                 $rootCollection = $collectionRole->getRootCollection();
                 if (! is_null($rootCollection)) {

Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,7 @@ public function getCollectionRole()`
`571`	`571`	`public function setCurrentCollectionId($setRoot = false)`
`572`	`572`	`{`
`573`	`573`	`if (! $setRoot) {`
`574`		`- $collectionRole = Opus_CollectionRole::fetchByOaiName($this->_collectionRole);`
	`574`	`+ $collectionRole = Opus_CollectionRole::fetchByName($this->_collectionRole);`
`575`	`575`	`if (! is_null($collectionRole)) {`
`576`	`576`	`$rootCollection = $collectionRole->getRootCollection();`
`577`	`577`	`if (! is_null($rootCollection)) {`