Merge branch 'master_MDL-54575' of git://github.com/danmarsden/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Nov 2016 05:58:04 +0000 (13:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Nov 2016 05:58:04 +0000 (13:58 +0800)
mod/scorm/mod_form.php

index 5f6e5b0..b53d09a 100644 (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'] .= '%';
         }