Merge branch 'release/1.1.54'

nystudio107 · Oct 10, 2017 · b4a1d3c · b4a1d3c
2 parents 3d37a00 + 76a8888
commit b4a1d3c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # SEOmatic Changelog
 
+## 1.1.54 - 2017.10.10
+### Changed
+* More intelligent handling of `addTrailingSlashesToUrls`
+
 ## 1.1.53 - 2017.10.06
 ### Changed
 * Fixed a regression with certain types of localized sites

diff --git a/SeomaticPlugin.php b/SeomaticPlugin.php
@@ -26,7 +26,7 @@ public function getReleaseFeedUrl()
 
     public function getVersion()
     {
-        return '1.1.53';
+        return '1.1.54';
     }
 
     public function getSchemaVersion()

diff --git a/releases.json b/releases.json
@@ -1,4 +1,12 @@
 [
+    {
+        "version": "1.1.54",
+        "downloadUrl": "https://github.com/nystudio107/seomatic/archive/master.zip",
+        "date": "2017-10-10T11:00:00-11:00",
+        "notes": [
+            "[Improved] More intelligent handling of `addTrailingSlashesToUrls`"
+        ]
+    },
     {
         "version": "1.1.53",
         "downloadUrl": "https://github.com/nystudio107/seomatic/archive/master.zip",

diff --git a/services/SeomaticService.php b/services/SeomaticService.php
@@ -3114,13 +3114,15 @@ public function getFullyQualifiedUrl($url)
                 $result = UrlHelper::getSiteUrl($url, null, null, craft()->language);
             }
         }
-        // Add a trailing / if `addTrailingSlashesToUrls` is set, but only if there's one extension
-        if (craft()->config->get('addTrailingSlashesToUrls')) {
-            $path = parse_url($result, PHP_URL_PATH);
-            $pathExtension = pathinfo($path,PATHINFO_EXTENSION);
-            if (empty($pathExtension))
-                $result = rtrim($result, '/') . '/';
-        }
+    }
+
+    $result = rtrim($result, '/');
+    // Add a trailing / if `addTrailingSlashesToUrls` is set, but only if there's one extension
+    if (craft()->config->get('addTrailingSlashesToUrls')) {
+        $path = parse_url($result, PHP_URL_PATH);
+        $pathExtension = pathinfo($path,PATHINFO_EXTENSION);
+        if (empty($pathExtension))
+            $result = rtrim($result, '/') . '/';
     }
 
     return $result;