http://www.atutor.ca/atutor/mantis/view.php?id=4385

diff --git a/docs/home/course/content.php b/docs/home/course/content.php
index f344cfa..06edcda 100644 (file)
--- a/docs/home/course/content.php
+++ b/docs/home/course/content.php
@@ -105,7 +105,7 @@ foreach ($path as $i=>$page) {
        }
        
        if ($contentManager->_menu_info[$page['content_id']]['content_type'] == CONTENT_TYPE_FOLDER)
-               $content_url = 'home/course/edit_content_folder.php?_cid='.$page['content_id'];
+               $content_url = 'home/editor/edit_content_folder.php?_cid='.$page['content_id'];
        else
                $content_url = 'home/course/content.php?_cid='.$page['content_id'];
                
@@ -114,12 +114,17 @@ foreach ($path as $i=>$page) {
                $_pages[$content_url]['parent']   = 'home/index.php';
        } else {
                $_pages[$content_url]['title']    = $page['content_number'] . $page['title'];
-               $_pages[$content_url]['parent']   = 'home/course/edit_content_folder.php?_cid='.$parent;
+               if (isset($_pages['home/editor/edit_content_folder.php?_cid='.$parent])) {
+                       $_pages[$content_url]['parent']   = 'home/editor/edit_content_folder.php?_cid='.$parent;
+               } else {
+                       $_pages[$content_url]['parent']   = 'home/course/content.php?_cid='.$parent;
+               }
        }
 
        $_pages[$content_url]['ignore'] = true;
        $parent = $page['content_id'];
 }
+
 $last_page = array_pop($_pages);
 $_pages['home/course/content.php'] = $last_page;
 

diff --git a/docs/home/ims/ims_import.php b/docs/home/ims/ims_import.php
index 15042c1..4ca8995 100644 (file)
--- a/docs/home/ims/ims_import.php
+++ b/docs/home/ims/ims_import.php
@@ -1364,7 +1364,7 @@ foreach ($items as $item_id => $content_info)
        $items[$item_id]['real_content_id'] = $contentDAO->Create($_course_id, intval($content_parent_id), 
                            ($content_info['ordering'] + $my_offset - $lti_offset[$content_info['parent_content_id']] + 1),
                            0, $content_formatting, "", $content_info['new_path'], $content_info['title'],
-                           $content, $head, 1, $content_info['test_message'], 0, $content_folder_type);
+                           $content, $head, 1, $content_info['test_message'], $content_folder_type);
 
 //     $sql= 'INSERT INTO '.TABLE_PREFIX.'content'
 //           . '(course_id,