Merge branch 'mdl27_MDL-46408' of https://github.com/danmarsden/moodle into MOODLE_27_STABLE

2015-02-24 11:36:49 +08:00
parent 8bcfbda511 772ec0a6e3
commit 0eaac55d01
1 changed files with 3 additions and 1 deletions
@@ -564,7 +564,9 @@ function scorm_parse_scorm(&$scorm, $manifest) {
                        }
                    }

-                    if (!empty($defaultorgid) && empty($firstinorg) && $newitem->parent == $scoes->defaultorg) {
+                    if (!empty($defaultorgid) && !empty($scoes->defaultorg) && empty($firstinorg) &&
+                        $newitem->parent == $scoes->defaultorg) {
+
                        $firstinorg = $sortorder;
                    }