Merge pull request #1062 from nextcloud/backport/1048/stable22

[stable22] do not generate link if no front-end
nextcloud · Jun 13, 2022 · 8944406 · 8944406
2 parents e3fa4d2 + daa42e5
commit 8944406
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/lib/Model/ModelManager.php b/lib/Model/ModelManager.php
@@ -31,7 +31,7 @@
 
 namespace OCA\Circles\Model;
 
-use OCA\Circles\Tools\Traits\TNCLogger;
+use Exception;
 use OCA\Circles\AppInfo\Application;
 use OCA\Circles\Db\CircleRequest;
 use OCA\Circles\Db\CoreQueryBuilder;
@@ -56,6 +56,7 @@
 use OCA\Circles\Service\ConfigService;
 use OCA\Circles\Service\InterfaceService;
 use OCA\Circles\Service\RemoteService;
+use OCA\Circles\Tools\Traits\TNCLogger;
 use OCP\IURLGenerator;
 
 /**
@@ -532,10 +533,16 @@ public function fixInstance(string $instance): string {
 	 * @return string
 	 */
 	public function generateLinkToCircle(string $singleId): string {
-		return $this->urlGenerator->linkToRoute(
-			$this->configService->getAppValue(ConfigService::ROUTE_TO_CIRCLE),
-			['singleId' => $singleId]
-		);
+		$path = $this->configService->getAppValue(ConfigService::ROUTE_TO_CIRCLE);
+
+		try {
+			if ($path !== '') {
+				return $this->urlGenerator->linkToRoute($path, ['singleId' => $singleId]);
+			}
+		} catch (Exception $e) {
+		}
+
+		return '';
 	}