Merge pull request #694 from SamWhited/2.1

Fix Twitter integration over SSL
This commit is contained in:
Brandon Mathis 2012-07-30 11:21:34 -07:00
commit 777736a8b7
2 changed files with 3 additions and 3 deletions

View File

@ -5,9 +5,9 @@
<li class="loading">Status updating...</li> <li class="loading">Status updating...</li>
</ul> </ul>
{% if site.twitter_follow_button %} {% if site.twitter_follow_button %}
<a href="http://twitter.com/{{ site.twitter_user }}" class="twitter-follow-button" data-show-count="{{ site.twitter_show_follower_count }}">Follow @{{ site.twitter_user }}</a> <a href="//twitter.com/{{ site.twitter_user }}" class="twitter-follow-button" data-show-count="{{ site.twitter_show_follower_count }}">Follow @{{ site.twitter_user }}</a>
{% else %} {% else %}
<p>Follow <a href="http://twitter.com/{{site.twitter_user}}">@{{ site.twitter_user }}</a></p> <p>Follow <a href="//twitter.com/{{site.twitter_user}}">@{{ site.twitter_user }}</a></p>
{% endif %} {% endif %}
</section> </section>
{% endif %} {% endif %}

View File

@ -4,7 +4,7 @@
var twitterWidgets = document.createElement('script'); var twitterWidgets = document.createElement('script');
twitterWidgets.type = 'text/javascript'; twitterWidgets.type = 'text/javascript';
twitterWidgets.async = true; twitterWidgets.async = true;
twitterWidgets.src = 'http://platform.twitter.com/widgets.js'; twitterWidgets.src = '//platform.twitter.com/widgets.js';
document.getElementsByTagName('head')[0].appendChild(twitterWidgets); document.getElementsByTagName('head')[0].appendChild(twitterWidgets);
})(); })();
</script> </script>