Merge branch 'hotfix/6.5.1' into production

.github/workflows/pages-deploy.yml.hook

@@ -37,7 +37,7 @@ jobs:
 
       - name: Setup Pages
         id: pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -57,7 +57,7 @@ jobs:
             \-\-ignore-urls "/^http:\/\/127.0.0.1/,/^http:\/\/0.0.0.0/,/^http:\/\/localhost/"
 
       - name: Upload site artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: "_site${{ steps.pages.outputs.base_path }}"
 
@@ -70,4 +70,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4

_includes/img-url.html

@@ -29,9 +29,9 @@
     %}
 
     {% if include.absolute %}
-      {% assign url = url | absolute_url %}
+      {% assign url = site.url | append: site.base_url | append: url %}
     {% else %}
-      {% assign url = url | relative_url %}
+      {% assign url = site.base_url | append: url %}
     {% endif %}
   {% endunless %}
 {%- endif -%}