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

This commit is contained in:
David Monllao
2016-11-07 13:58:04 +08:00
+1 -1
View File
@@ -304,7 +304,7 @@ class mod_scorm_mod_form extends moodleform_mod {
&& ($defaultvalues['width'] <= 100)) {
$defaultvalues['width'] .= '%';
}
if (isset($defaultvalues['width']) && (strpos($defaultvalues['height'], '%') === false)
if (isset($defaultvalues['height']) && (strpos($defaultvalues['height'], '%') === false)
&& ($defaultvalues['height'] <= 100)) {
$defaultvalues['height'] .= '%';
}