Merge branch 'm34_MDL-58015' of https://github.com/danmarsden/moodle …

…into MOODLE_34_STABLE

mod/scorm/view.php

@@ -66,23 +66,22 @@
 
 $launch = false; // Does this automatically trigger a launch based on skipview.
 if (!empty($scorm->popup)) {
-    $orgidentifier = '';
-
     $scoid = 0;
     $orgidentifier = '';
 
     $result = scorm_get_toc($USER, $scorm, $cm->id, TOCFULLURL);
     // Set last incomplete sco to launch first.
     if (!empty($result->sco->id)) {
-        $scoid = $result->sco->id;
+        $sco = $result->sco;
     } else {
-        if ($sco = scorm_get_sco($scorm->launch, SCO_ONLY)) {
-            if (($sco->organization == '') && ($sco->launch == '')) {
-                $orgidentifier = $sco->identifier;
-            } else {
-                $orgidentifier = $sco->organization;
-            }
-            $scoid = $sco->id;
+        $sco = scorm_get_sco($scorm->launch, SCO_ONLY);
+    }
+    if (!empty($sco)) {
+        $scoid = $sco->id;
+        if (($sco->organization == '') && ($sco->launch == '')) {
+            $orgidentifier = $sco->identifier;
+        } else {
+            $orgidentifier = $sco->organization;
         }
     }