From ff36a0245193f8094e848e40078d73c4dbcf7540 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 30 Jan 2026 18:09:39 +0100
Subject: [PATCH] wip #7868 @0.5

---
 app/Fluidbook/Compiler/Links.php                  | 2 +-
 app/Models/FluidbookPublication.php               | 2 +-
 resources/linkeditor-stable/js/linkeditor.form.js | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/Fluidbook/Compiler/Links.php b/app/Fluidbook/Compiler/Links.php
index 704ef3444..1a82f2109 100644
--- a/app/Fluidbook/Compiler/Links.php
+++ b/app/Fluidbook/Compiler/Links.php
@@ -531,7 +531,7 @@ trait Links
     public function shortenURL($url)
     {
 
-        if (!$this->config->linkShortener || !Url::isDistant($url)) {
+        if (!$this->config->linkShortener || $this->config->linkShortener === 'none' || !Url::isDistant($url)) {
             return $url;
         }
         return LinkShortener::shorturl($url, $this->config->linkShortener);
diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index f26235469..96b267813 100644
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -1410,7 +1410,7 @@ class FluidbookPublication extends ToolboxStatusModel
 
     public function getShortenedLinks()
     {
-        if (!$this->linkShortener) {
+        if (!$this->linkShortener || $this->linkShortener === 'none') {
             return [];
         }
         $res = [];
diff --git a/resources/linkeditor-stable/js/linkeditor.form.js b/resources/linkeditor-stable/js/linkeditor.form.js
index bf6b258c5..97e4ae5de 100644
--- a/resources/linkeditor-stable/js/linkeditor.form.js
+++ b/resources/linkeditor-stable/js/linkeditor.form.js
@@ -273,8 +273,6 @@ LinkeditorForm.prototype = {
         var type = $(link).attr('fb-type');
         var form = $("#linkeditor-form-template-" + type).clone(false);
 
-
-
         $(form).attr('id', null);
         $(form).data('link', link);
         $(form).find('.init-tooltip').removeClass('init-tooltip');
-- 
2.39.5