Merge branch 'm19_MDL-26216_windowoptions' of github.com:danmarsden/moodle into MOODLE_19_STABLE

2011-02-14 21:40:23 +01:00
parent 05d38f44cc 776ecc8b9d
commit af497cf64c
1 changed files with 3 additions and 1 deletions
@@ -100,7 +100,9 @@ function scorm_update_instance($scorm) {
    $scorm->timemodified = time();
    $scorm->id = $scorm->instance;

-    $scorm = scorm_option2text($scorm);
+    if (empty($scorm->options)) {
+        $scorm = scorm_option2text($scorm);
+    }
    $scorm->width = str_replace('%','',$scorm->width);
    $scorm->height = str_replace('%','',$scorm->height);