--- loncom/interface/loncommon.pm	2018/09/09 21:30:40	1.1075.2.130
+++ loncom/interface/loncommon.pm	2019/02/03 22:31:17	1.1075.2.131
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.130 2018/09/09 21:30:40 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.131 2019/02/03 22:31:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -13195,7 +13195,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;