Merge branch 'master_MDL-27404' of git://github.com/danmarsden/moodle

moodle · Jun 13, 2011 · aa8ec18 · aa8ec18
2 parents 16c2d2c + d1e3b5c
commit aa8ec18
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/mod/scorm/api.php b/mod/scorm/api.php
@@ -10,8 +10,10 @@
     $attempt = required_param('attempt', PARAM_INT); // new attempt
 
     //IE 6 Bug workaround
-    if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 6') !== false && ini_get('zlib.output_compression') == 'On') {
+    if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 6') !== false) {
-        ini_set('zlib.output_compression', 'Off');
+        @ini_set('zlib.output_compression', 'Off');
+        @apache_setenv('no-gzip', 1);
+        header( 'Content-Type: application/javascript' );
     }
 
     if (!empty($id)) {

diff --git a/mod/scorm/player.php b/mod/scorm/player.php
@@ -17,8 +17,9 @@
     $newattempt = optional_param('newattempt', 'off', PARAM_ALPHA); // the user request to start a new attempt
 
     //IE 6 Bug workaround
-    if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 6') !== false && ini_get('zlib.output_compression') == 'On') {
+    if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 6') !== false) {
-        ini_set('zlib.output_compression', 'Off');
+        @ini_set('zlib.output_compression', 'Off');
+        @apache_setenv('no-gzip', 1);
     }
 
     if (!empty($id)) {