Merged branch 'MDL-25775_head' of git://github.com/grabs/moodle.git

diff --cc lib/resourcelib.php
index 9df4927,7646709..7aeed91
--- 1/lib/resourcelib.php
--- 2/lib/resourcelib.php
+++ b/lib/resourcelib.php
@@@ -487,10 -487,14 +487,15 @@@ function resourcelib_embed_general($ful
      }
  
      $iframe = false;
 -    
++
+     $param = '<param name="src" value="'.$fullurl.'" />';
 -    
++
      // IE can not embed stuff properly if stored on different server
      // that is why we use iframe instead, unfortunately this tag does not validate
      // in xhtml strict mode
      if ($mimetype === 'text/html' and check_browser_version('MSIE', 5)) {
++        // The param tag needs to be removed to avoid trouble in IE.
+         $param = '';
          if (preg_match('(^https?://[^/]*)', $fullurl, $matches)) {
              if (strpos($CFG->wwwroot, $matches[0]) !== 0) {
                  $iframe = true;