Code cleanup

putyourlightson · Feb 8, 2024 · 1cde659 · 1cde659
1 parent 5d2f325
commit 1cde659
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/src/helpers/SettingsHelper.php b/src/helpers/SettingsHelper.php
@@ -133,13 +133,7 @@ public static function isDynamicWebAliasUsed(int $siteId = null): bool
         }
 
         foreach ($sites as $site) {
-            // How this works was changed in 3.6.0
-            // https://github.com/craftcms/cms/issues/3964#issuecomment-737546660
-            if (version_compare(Craft::$app->getVersion(), '3.6.0', '>=')) {
-                $unparsedBaseUrl = $site->getBaseUrl(false);
-            } else {
-                $unparsedBaseUrl = $site->baseUrl;
-            }
+            $unparsedBaseUrl = $site->getBaseUrl(false);
 
             if (stripos($unparsedBaseUrl, '@web') !== false) {
                 return true;

diff --git a/src/services/FormsService.php b/src/services/FormsService.php
@@ -146,7 +146,7 @@ public function sendVerifyUnsubscribeEmail(ContactElement $contact, MailingListE
     }
 
     /**
-     * Creates and subscribes a contact, with verification if enabled on the mailing list.
+     * Creates and subscribes a contact, with verification if enabled on the mailing list type.
      *
      * @since 2.1.0
      */

diff --git a/src/templates/_settings/campaigntypes/edit.twig b/src/templates/_settings/campaigntypes/edit.twig
@@ -135,7 +135,6 @@
     {{ forms.checkboxField({
         label: "Show the Title field"|t('app'),
         name: 'hasTitleField',
-        toggle: 'title-container',
         reverseToggle: '#titleFormat-container, .fld-title-field-icon',
         checked: campaignType.hasTitleField,
     }) }}
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         /**
-         * Creates and subscribes a contact, with verification if enabled on the mailing list.
+         * Creates and subscribes a contact, with verification if enabled on the mailing list type.
          *
          * @since 2.1.0
          */
@@ Expand Down @@