Merge branch 'master' into next

* master: Fix feincms#373: Video embedding on SSL-secured websites Conflicts: feincms/templates/content/video/vimeo.html
matthiask · Jan 10, 2013 · dea625f · dea625f
2 parents d8eb34d + 9b77712
commit dea625f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/feincms/templates/content/video/vimeo.html b/feincms/templates/content/video/vimeo.html
@@ -1,2 +1,2 @@
-<iframe src="http://player.vimeo.com/video/{{ id }}" width="650" height="365"
+<iframe src="https://player.vimeo.com/video/{{ id }}" width="650" height="365"
 frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
diff --git a/feincms/templates/content/video/youtube.html b/feincms/templates/content/video/youtube.html
@@ -1,6 +1,6 @@
 <object width="425" height="344">
-<param name="movie" value="http://www.youtube.com/v/{{ v }}&hl=en&fs=1&"></param>
+<param name="movie" value="https://www.youtube.com/v/{{ v }}&hl=en&fs=1&"></param>
 <param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param>
-<embed src="http://www.youtube.com/v/{{ v }}&hl=en&fs=1&" type="application/x-shockwave-flash"
+<embed src="https://www.youtube.com/v/{{ v }}&hl=en&fs=1&" type="application/x-shockwave-flash"
     allowscriptaccess="always" allowfullscreen="true" width="425" height="344"></embed>
 </object>