--- loncom/interface/loncommon.pm	2008/02/02 21:45:47	1.636.2.1
+++ loncom/interface/loncommon.pm	2008/01/22 22:37:18	1.637
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.636.2.1 2008/02/02 21:45:47 raeburn Exp $
+# $Id: loncommon.pm,v 1.637 2008/01/22 22:37:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8083,26 +8083,19 @@ sub construct_course {
 	$outcome .= $clonemsg.$linefeed;
 	my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum);
 # Copy all files
-	&Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid);
+	&Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid,$args->{'datemode'},$args->{'dateshift'});
 # Restore URL
 	$cenv{'url'}=$oldcenv{'url'};
 # Restore title
 	$cenv{'description'}=$oldcenv{'description'};
+# restore grading mode
+	if (defined($oldcenv{'grading'})) {
+	    $cenv{'grading'}=$oldcenv{'grading'};
+	}
 # Mark as cloned
 	$cenv{'clonedfrom'}=$cloneid;
-# Need to clone grading mode
-        my %newenv=&Apache::lonnet::get('environment',['grading'],$$crsudom,$$crsunum);
-        $cenv{'grading'}=$newenv{'grading'};
-# Do not clone these environment entries
-        &Apache::lonnet::del('environment',
-                  ['default_enrollment_start_date',
-                   'default_enrollment_end_date',
-                   'question.email',
-                   'policy.email',
-                   'comment.email',
-                   'pch.users.denied',
-                   'plc.users.denied'],
-                   $$crsudom,$$crsunum);
+	delete($cenv{'default_enrollment_start_date'});
+	delete($cenv{'default_enrollment_end_date'});
     }
 
 #