Merge branch 'hotfix/6.5.4' into production

_includes/head.html

@@ -39,7 +39,7 @@
     {%- endcapture -%}
 
     {%- capture twitter_image -%}
-      <meta property="twitter:card" content="summary_large_image" />
+      <meta name="twitter:card" content="summary_large_image" />
       <meta property="twitter:image" content="{{ img_url }}" />
     {%- endcapture -%}
 

_includes/img-url.html

@@ -14,24 +14,26 @@
 
 {%- if url -%}
   {% unless url contains ':' %}
-    {%- comment -%} CND URL {%- endcomment -%}
-    {% assign prefix = site.img_cdn | default: '' %}
-
     {%- comment -%} Add page image path prefix {%- endcomment -%}
     {% assign url = include.img_path | default: '' | append: '/' | append: url %}
 
-    {% assign url = prefix
+    {%- comment -%} CND URL {%- endcomment -%}
-      | append: '/'
+    {% if site.img_cdn %}
-      | append: url
+      {% assign url = site.img_cdn
-      | replace: '///', '/'
+        | append: '/'
-      | replace: '//', '/'
+        | append: url
-      | replace: ':', ':/'
+        | replace: '///', '/'
-    %}
+        | replace: '//', '/'
+        | replace: ':/', '://'
+      %}
 
-    {% if include.absolute %}
+      {% unless site.img_cdn contains ':' %}
-      {% assign url = site.url | append: site.baseurl | append: url %}
+        {% if include.absolute %}
-    {% else %}
+          {% assign url = site.url | append: site.baseurl | append: url %}
-      {% assign url = site.baseurl | append: url %}
+        {% else %}
+          {% assign url = site.baseurl | append: url %}
+        {% endif %}
+      {% endunless %}
     {% endif %}
   {% endunless %}
 {%- endif -%}