From: vyshane <vyshane>
Date: Thu, 8 Jun 2006 07:39:37 +0000 (+0000)
Subject: Merge from 1.6. Fix for scorm_option2text(). options field is now saved
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=da52f1523c07adc1a20adef0b04389a22608070f;p=moodle.git

Merge from 1.6. Fix for scorm_option2text(). options field is now saved
proprely.
---

diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index b8c8f28f63..f814162a85 100755
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -542,17 +542,18 @@ function scorm_scandir($directory) {
     }
 }
 
+
 function scorm_option2text($scorm) {
     global $SCORM_POPUP_OPTIONS;
 
     if (isset($scorm->popup)) {
         if ($scorm->popup) {
             $optionlist = array();
-            foreach ($SCORM_POPUP_OPTIONS as $option) {
-                if (isset($scorm->$option)) {
-                    $optionlist[] = $option.'='.$scorm->$option;
+            foreach ($SCORM_POPUP_OPTIONS as $name => $option) {
+                if (isset($scorm->$name)) {
+                    $optionlist[] = $name.'='.$scorm->$name;
                 } else {
-                    $optionlist[] = $option.'=0';
+                    $optionlist[] = $name.'=0';
                 }
             }       
             $scorm->options = implode(',', $optionlist);
@@ -566,4 +567,4 @@ function scorm_option2text($scorm) {
     return $scorm;
 }
 
-?>
+?>
\ No newline at end of file