aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Hemberger <mail@frederic-hemberger.de>2011-10-21 14:04:34 +0200
committerFrederic Hemberger <mail@frederic-hemberger.de>2011-10-21 14:04:34 +0200
commit514e84831ca2d9bce27c2a209b67fce26b5c52e8 (patch)
treee485fbd022bfb72f3d9a2896f24f8680e92f5a14
parent2043c543d2b5d5e6d59ecf713db9d218e1c8ef8d (diff)
downloadmy_new_personal_website-514e84831ca2d9bce27c2a209b67fce26b5c52e8.tar.xz
my_new_personal_website-514e84831ca2d9bce27c2a209b67fce26b5c52e8.zip
Use canonical URL for Disqus, fixes #236
-rw-r--r--.themes/classic/source/_includes/disqus.html5
-rw-r--r--.themes/classic/source/_includes/head.html2
2 files changed, 3 insertions, 4 deletions
diff --git a/.themes/classic/source/_includes/disqus.html b/.themes/classic/source/_includes/disqus.html
index a58512b5..b4ee5c64 100644
--- a/.themes/classic/source/_includes/disqus.html
+++ b/.themes/classic/source/_includes/disqus.html
@@ -1,13 +1,12 @@
{% comment %} Load script if disquss comments are enabled and `page.comments` is either empty (index) or set to true {% endcomment %}
{% if site.disqus_short_name and page.comments != false %}
<script type="text/javascript">
-
var disqus_shortname = '{{ site.disqus_short_name }}';
{% if page.comments == true %}
{% comment %} `page.comments` can be only be set to true on pages/posts, so we embed the comments here. {% endcomment %}
// var disqus_developer = 1;
- var disqus_identifier = '{{ site.url }}{{ page.url }}';
- var disqus_url = '{{ site.url }}{{ page.url }}';
+ var disqus_identifier = '{{ canonical }}';
+ var disqus_url = '{{ canonical }}';
var disqus_script = 'embed.js';
{% else %}
{% comment %} As `page.comments` is empty, we must be on the index page. {% endcomment %}
diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html
index 5ae6be08..51c5415e 100644
--- a/.themes/classic/source/_includes/head.html
+++ b/.themes/classic/source/_includes/head.html
@@ -16,7 +16,7 @@
<meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, initial-scale=1">
- {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
+ {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
<link rel="canonical" href="{{ canonical }}">
<link href="{{ root_url }}/favicon.png" rel="icon">
<link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">