Index: admin/settings/misc.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/settings/Attic/misc.php,v
retrieving revision 1.14.2.6
diff -u -r1.14.2.6 misc.php
--- admin/settings/misc.php	30 Sep 2009 10:58:05 -0000	1.14.2.6
+++ admin/settings/misc.php	18 Oct 2009 21:43:25 -0000
@@ -16,6 +16,7 @@
     $rqsetting->plugin = 'qtype_random';
     $temp->add($rqsetting);
     $temp->add(new admin_setting_configcheckbox('experimentalsplitrestore', get_string('experimentalsplitrestore', 'admin'), get_string('configexperimentalsplitrestore', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('enableimsccimport', get_string('enable_cc_import', 'imscc'), get_string('enable_cc_import_description', 'imscc'), 0));
     $temp->add(new admin_setting_configcheckbox('enablesafebrowserintegration', get_string('enablesafebrowserintegration', 'admin'), get_string('configenablesafebrowserintegration', 'admin'), 0));
 
     $ADMIN->add('misc', $temp);
Index: backup/restorelib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/backup/restorelib.php,v
retrieving revision 1.283.2.79
diff -u -r1.283.2.79 restorelib.php
--- backup/restorelib.php	6 Oct 2009 01:22:15 -0000	1.283.2.79
+++ backup/restorelib.php	18 Oct 2009 21:43:32 -0000
@@ -7658,6 +7658,16 @@
             }
         }
 
+        // If experimental option is enabled (enableimsccimport)
+        // check for Common Cartridge packages and convert to Moodle format
+        if ($status && isset($CFG->enableimsccimport) && $CFG->enableimsccimport == 1) {
+            require_once($CFG->dirroot. '/backup/cc/restore_cc.php');
+            if (!defined('RESTORE_SILENTLY')) {
+                echo "<li>".get_string('checkingforimscc', 'imscc').'</li>';
+            }
+            $status = cc_convert($CFG->dataroot. DIRECTORY_SEPARATOR .'temp'. DIRECTORY_SEPARATOR . 'backup'. DIRECTORY_SEPARATOR . $backup_unique_code);
+        }
+
         //Check for Blackboard backups and convert
         if ($status){
             require_once("$CFG->dirroot/backup/bb/restore_bb.php");