fix #2066 @0.5

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 55985e7482aad8d18a6722bb41c0f9fba41b2047..486cc4b2be0af0dfb922e86080223575116d0f42 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -539,7 +539,7 @@ class wsBookParametres extends wsParametres
                        'datas' => array(__('SCORM 1.2') => '1.2',
                                __('SCORM 2004 4th edition') => '2004')
                );
-               $this->fields['scorm_id'] = array('type' => 'text', 'default' => 'MFMCTE091mobile', 'editable' => true, 'label' => __('Identifiant SCORM'), 'grade' => 5);
+               $this->fields['scorm_id'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Identifiant SCORM'), 'grade' => 5);
                $this->fields['scorm_org'] = array('type' => 'text', 'default' => 'ACME-ORG-1350650111249', 'editable' => true, 'label' => __('Organisation SCORM'), 'grade' => 5);
                $this->fields['scorm_title'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Titre SCORM'), 'grade' => 5, 'hint' => __('Laisser vide pour utiliser le titre de la publication'));
                $this->fields['scorm_variables'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Variables SCORM'), 'grade' => 5, 'hint' => __('Laisser vide pour utiliser le titre de la publication'));

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index fd18a85124310b24adee7b9ec10ff425b1266a87..ec8cb08c51545e3428455284fc83f1d3a8063753 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -718,7 +718,7 @@ class wsHTML5Compiler
                if (!$this->book->parametres->scorm_title) {
                        $this->book->parametres->scorm_title = $this->book->parametres->title;
                }
-               if (!$this->book->parametres->scorm_id) {
+               if (!$this->book->parametres->scorm_id || ($this->book->parametres->id > 16614 && $this->book->parametres->scorm_id == 'MFMCTE091mobile')) {
                        $this->book->parametres->scorm_id = 'fb_' . $this->book->parametres->id;
                }
                if (!$this->book->parametres->scorm_org) {