Render default text before auto text. Bump to 2.5.1

vaersaagod · Feb 18, 2024 · 3692f38 · 3692f38
1 parent 0ff87be
commit 3692f38
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -1,6 +1,11 @@
 # Release Notes for LinkMate
 
+## 2.5.1 - 2024-02-18
+### Fixed
+- Fixes an issue where Link fields' default text would, realistically, never render  
+
 ## 2.5.0.1 - 2023-10-20
+### Fixed
 - Fix exception that could be thrown when getting search keywords for link fields
 
 ## 2.5.0 - 2023-10-19

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "vaersaagod/linkmate",
     "description": "Let's hook you up, mate!",
     "type": "craft-plugin",
-    "version": "2.5.0.1",
+    "version": "2.5.1",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/models/Link.php b/src/models/Link.php
@@ -344,13 +344,12 @@ public function getText(): ?string
             return $this->customText;
         }
 
-        $linkText = $this->getLinkType()?->getText($this);
-
-        if (!empty($linkText)) {
-            return $linkText;
+        $defaultText = Craft::t('site', $this->getDefaultText());
+        if (!empty($defaultText)) {
+            return $defaultText;
         }
 
-        return Craft::t('site', $this->getDefaultText());
+        return $this->getLinkType()?->getText($this);
     }
 
     /**