Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions home/ims/ims_import.php
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,8 @@ function checkResources($import_path){
$errors = libxml_get_errors();
foreach ($errors as $error) {
//suppress warnings
if ($error->level==LIBXML_ERR_WARNING){
continue;
}
if ($error->level==LIBXML_ERR_WARNING) continue;

$msg->addError(array('IMPORT_CARTRIDGE_FAILED', libxml_display_error($error)));
}
libxml_clear_errors();
Expand Down Expand Up @@ -1375,8 +1374,9 @@ function glossaryCharacterData($parser, $data){
$xml_content = @file_get_contents($import_path . $forum_link);
$dt_parser->parse($xml_content);
$forum_obj = $dt_parser->getDt();
$dt_import->import($forum_obj, $items[$item_id]['real_content_id'], $_course_id);
$added_dt[$forum_ref] = $dt_import->getFid();
$result = $dt_import->import($forum_obj, $items[$item_id]['real_content_id'], $_course_id);
if ($result)
$added_dt[$forum_ref] = $dt_import->getFid();
}

}
Expand Down Expand Up @@ -1445,4 +1445,4 @@ function glossaryCharacterData($parser, $data){
}
exit;

?>
?>
15 changes: 10 additions & 5 deletions include/classes/DiscussionTools/DiscussionToolsImport.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ function import($forum_obj, $cid, $course_id){
$text = $forum_obj->getText();

$this->fid = $this->createForum($title, $text, $course_id);
$this->associateForum($cid, $this->fid);
if ($this->fid) {
$this->associateForum($cid, $this->fid);
return true;
} else
return false;
}


Expand All @@ -45,9 +49,10 @@ function import($forum_obj, $cid, $course_id){
function createForum($title, $text, $course_id){
$forumsDAO = new ForumsDAO();
$forums_id = $forumsDAO->Create($title, $text);

$forumsCoursesDAO = new ForumsCoursesDAO();
$forumsCoursesDAO->Create($forums_id, $course_id);
if ($forums_id) {
$forumsCoursesDAO = new ForumsCoursesDAO();
$forumsCoursesDAO->Create($forums_id, $course_id);
}

return $forums_id;
}
Expand All @@ -71,4 +76,4 @@ function getFid(){
return $this->fid;
}
}
?>
?>