Merge pull request #2379 from LibreSign/backport/2378/stable28

[stable28] Move logic to method
LibreSign · Feb 28, 2024 · 1a719a0 · 1a719a0
2 parents 6dff536 + c066c9f
commit 1a719a0
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/Service/FileService.php b/lib/Service/FileService.php
@@ -275,6 +275,9 @@ private function getPages(): array {
 	 */
 	private function getVisibleElements(): array {
 		$return = [];
+		if (!$this->showVisibleElements) {
+			return $return;
+		}
 		try {
 			if (is_object($this->signRequest)) {
 				$visibleElements = $this->fileElementMapper->getByFileIdAndSignRequestId($this->file->getId(), $this->signRequest->getId());
@@ -380,9 +383,7 @@ private function getFile(): array {
 		if ($this->showSigners) {
 			$return['signers'] = $this->getSigners();
 		}
-		if ($this->showVisibleElements) {
-			$return['visibleElements'] = $this->getVisibleElements();
-		}
+		$return['visibleElements'] = $this->getVisibleElements();
 		ksort($return);
 		return $return;
 	}