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,26 +14,28 @@
 
 {%- 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 -%}
+    {% if site.img_cdn %}
+      {% assign url = site.img_cdn
         | append: '/'
         | append: url
         | replace: '///', '/'
         | replace: '//', '/'
-      | replace: ':', ':/'
+        | replace: ':/', '://'
       %}
 
+      {% unless site.img_cdn contains ':' %}
         {% if include.absolute %}
           {% assign url = site.url | append: site.baseurl | append: url %}
         {% else %}
           {% assign url = site.baseurl | append: url %}
         {% endif %}
       {% endunless %}
+    {% endif %}
+  {% endunless %}
 {%- endif -%}
 
 {{- url -}}