X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=blobdiff_plain;f=mod%2Fimscp%2Fdb%2Fupgradelib.php;h=a6e28404e9e082f6dd44006add9c78af2064852c;hp=d842c4e0f3f6991a379bcaf866a1ac235ebf41a7;hb=b498d58506bbbbdd34355c9cd1f0b1b5280cb938;hpb=fd17ce0fb7073e9effa6ca60347c3933b454948b

diff --git a/mod/imscp/db/upgradelib.php b/mod/imscp/db/upgradelib.php
index d842c4e0f3f..a6e28404e9e 100644
--- a/mod/imscp/db/upgradelib.php
+++ b/mod/imscp/db/upgradelib.php
@@ -55,11 +55,19 @@ function imscp_20_migrate() {
     foreach ($candidates as $candidate) {
         upgrade_set_timeout(60);
 
+        if ($CFG->texteditors !== 'textarea') {
+            $intro       = text_to_html($candidate->intro, false, false, true);
+            $introformat = FORMAT_HTML;
+        } else {
+            $intro       = $candidate->intro;
+            $introformat = FORMAT_MOODLE;
+        }
+
         $imscp = new object();
         $imscp->course       = $candidate->course;
         $imscp->name         = $candidate->name;
-        $imscp->intro        = $candidate->intro;
-        $imscp->introformat  = $candidate->introformat;
+        $imscp->intro        = $intro;
+        $imscp->introformat  = $introformat;
         $imscp->revision     = 1;
         $imscp->keepold      = 1;
         $imscp->timemodified = time();
@@ -77,7 +85,8 @@ function imscp_20_migrate() {
             $fullpath = $root.'/'.$package;
             if (file_exists($fullpath)) {
                 $file_record = array('contextid' => $context->id,
-                                     'filearea'  => 'imscp_backup',
+                                     'component' => 'mod_imscp',
+                                     'filearea'  => 'backup',
                                      'itemid'    => 1,
                                      'filepath'  => '/',
                                      'filename'  => $package);
@@ -93,7 +102,7 @@ function imscp_20_migrate() {
             continue;
         }
 
-        $file_record = array('contextid'=>$context->id, 'filearea'=>'imscp_content', 'itemid'=>1);
+        $file_record = array('contextid'=>$context->id, 'component'=>'mod_imscp', 'filearea'=>'content', 'itemid'=>1);
         $error = false;
         foreach ($files as $relname=>$fullpath) {
             $parts = explode('/', $relname);