Properly merged fixes from 1.8

diff --git a/mod/scorm/datamodels/scorm_12.js.php b/mod/scorm/datamodels/scorm_12.js.php
index 2e31a3fb285eafc835d189d875c78652d604a596..213de3884ab12a89667fcb4d68e3562027dd7018 100644 (file)
--- a/mod/scorm/datamodels/scorm_12.js.php
+++ b/mod/scorm/datamodels/scorm_12.js.php
@@ -18,8 +18,8 @@ function SCORMapi1_2() {
     // Standard Data Type Definition
     CMIString256 = '^.{0,255}$';
     CMIString4096 = '^.{0,4096}$';
-    //CMIString256 = '^[.\\n\\r]{0,255}$';
-    //CMIString4096 = '^[.\\n\\r]{0,4095}$';
+    //CMIString256 = '^[\.|\\n|\\r]{0,255}$';
+    //CMIString4096 = '^[\.|\\n|\\r]{0,4095}$';
     CMITime = '^([0-2]{1}[0-9]{1}):([0-5]{1}[0-9]{1}):([0-5]{1}[0-9]{1})(\.[0-9]{1,2})?$';
     CMITimespan = '^([0-9]{2,4}):([0-9]{2}):([0-9]{2})(\.[0-9]{1,2})?$';
     CMIInteger = '^\\d+$';