Merge branch 'w13_MDL-22733_20_youtubeiframe' of git://github.com/sko…

…dak/moodle into MOODLE_20_STABLE
moodle · Mar 28, 2011 · d245530 · d245530
2 parents 1be2b90 + c4b491a
commit d245530
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php
@@ -672,8 +672,7 @@ function filter_mediaplugin_youtube_callback($link) {
     $width  = empty($link[5]) ? FILTER_MEDIAPLUGIN_VIDEO_WIDTH  : $link[5];
     $height = empty($link[6]) ? FILTER_MEDIAPLUGIN_VIDEO_HEIGHT : $link[6];
 
-    if (false and empty($CFG->xmlstrictheaders)) {
-        // TODO: remove this once iframe playback starts to work properly in iPads
+    if (empty($CFG->xmlstrictheaders)) {
         return <<<OET
 <iframe title="$info" width="$width" height="$height" src="$site/embed/$videoid?rel=0" frameborder="0" allowfullscreen></iframe>
 OET;