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

This commit is contained in:
Dan Poltawski 2014-01-14 15:00:11 +08:00
commit 2be353c195

View File

@ -28,18 +28,6 @@ $currentorg = optional_param('currentorg', '', PARAM_RAW); // selected organizat
$newattempt = optional_param('newattempt', 'off', PARAM_ALPHA); // the user request to start a new attempt.
$displaymode = optional_param('display', '', PARAM_ALPHA);
// IE 9 workaround for Flash bug: MDL-29213
// Note that it's not clear if appending the meta tag via $CFG->additionalhtmlhead
// is correct at all, both because of the mechanism itself and because MS says
// the tag must be used *before* including other stuff. See the issue for more info.
// TODO: Once we implement some way to inject meta tags, change this to use it. MDL-30039
if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 9') !== false) {
if (!isset($CFG->additionalhtmlhead)) { //check to make sure set first - that way we can use .=
$CFG->additionalhtmlhead = '';
}
$CFG->additionalhtmlhead .= '<meta http-equiv="X-UA-Compatible" content="IE=8" />';
}
if (!empty($id)) {
if (! $cm = get_coursemodule_from_id('scorm', $id)) {
print_error('invalidcoursemodule');