Merge branch 'MDL-38426_dnd_plain_text' of git://github.com/davosmith/moodle

2013-03-19 14:36:43 +08:00
parent a34ffe2e2e 3d38777333
commit 08f5b90bb7
1 changed files with 3 additions and 0 deletions
@@ -264,6 +264,9 @@ function label_dndupload_handle($uploadinfo) {
        }
    } else if (!empty($uploadinfo->content)) {
        $data->intro = $uploadinfo->content;
+        if ($uploadinfo->type != 'text/html') {
+            $data->introformat = FORMAT_PLAIN;
+        }
    }

    return label_add_instance($data, null);