--- loncom/interface/loncommon.pm	2018/05/02 19:12:31	1.1075.2.127.2.5
+++ loncom/interface/loncommon.pm	2019/02/04 01:32:50	1.1075.2.127.2.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.127.2.5 2018/05/02 19:12:31 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.127.2.6 2019/02/04 01:32:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -13232,7 +13232,7 @@ sub load_tmp_file {
 
 sub valid_datatoken {
     my ($datatoken) = @_;
-    if ($datatoken =~ /^$match_username\_$match_domain\_enroll_$match_domain\_$match_courseid\_\d+_\d+$/) {
+    if ($datatoken =~ /^$match_username\_$match_domain\_enroll_(|$match_domain\_$match_courseid)\_\d+_\d+$/) {
         return $datatoken;
     }
     return;