Resource frameset error in IE6 MDL-6842, patch submitted by Chris Fryer.

author skodak <skodak>

Sun, 8 Oct 2006 08:20:38 +0000 (08:20 +0000)

committer skodak <skodak>

Sun, 8 Oct 2006 08:20:38 +0000 (08:20 +0000)
author skodak <skodak>
Sun, 8 Oct 2006 08:20:38 +0000 (08:20 +0000)
committer skodak <skodak>
Sun, 8 Oct 2006 08:20:38 +0000 (08:20 +0000)
diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php

index 54f67ad499a36ad551f687533c95734cf9012510..aaa716163540e68475da65518f7676ff366c9e85 100644 (file)
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -351,6 +351,7 @@ function display() {
      $frameset = optional_param( 'frameset','' );
      if (empty($frameset) and !$embedded and !$inpopup and ($resource->options == "frame")) {
          $encoding = current_charset();
+        @header('Content-Type: text/html; charset='.$encoding);
          echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\">\n";
          echo "<html dir=\"ltr\">\n";
          echo '<head>';
@@ -440,7 +441,7 @@ function display() {
              echo "<center><p>";
              echo '<object classid="CLSID:22D6f312-B0F6-11D0-94AB-0080C74C7E95"';
              echo '        codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701" ';
-            echo '        standby="Loading Microsoft® Windows® Media Player components..." ';
+            echo '        standby="Loading Microsoft� Windows� Media Player components..." ';
              echo '        id="msplayer" align="" type="application/x-oleobject">';
              echo "<param name=\"Filename\" value=\"$fullurl\">";
              echo '<param name="ShowControls" value="true" />';
author	skodak <skodak>
	Sun, 8 Oct 2006 08:20:38 +0000 (08:20 +0000)
committer	skodak <skodak>
	Sun, 8 Oct 2006 08:20:38 +0000 (08:20 +0000)