--- loncom/auth/lonroles.pm	2010/08/12 23:40:49	1.256.2.1
+++ loncom/auth/lonroles.pm	2010/08/26 04:43:10	1.256.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.256.2.1 2010/08/12 23:40:49 raeburn Exp $
+# $Id: lonroles.pm,v 1.256.2.3 2010/08/26 04:43:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1582,7 +1582,7 @@ sub check_release_required {
     my ($switchserver,$warning);
     if ($required ne '') {
         my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/);
-        my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\d.\-]+\'?$/);
+        my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
         if ($reqdmajor ne '' && $reqdminor ne '') {
             my $otherserver;
             if (($major eq '' && $minor eq '') || 
@@ -1591,7 +1591,7 @@ sub check_release_required {
                 my $switchlcrev = 
                     &Apache::lonnet::get_server_loncaparev($env{'user.domain'},
                                                            $userdomserver);
-                my ($swmajor,$swminor) = ($switchlcrev =~ /^\'?(\d+)\.(\d+)\.[\d.\-]+\'?$/);
+                my ($swmajor,$swminor) = ($switchlcrev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
                 if (($swmajor eq '' && $swminor eq '') || ($reqdmajor > $swmajor) || 
                     (($reqdmajor == $swmajor) && ($reqdminor > $swminor))) {
                     my $cdom = $env{'course.'.$tcourseid.'.domain'};
@@ -1755,7 +1755,7 @@ sub display_cc_role {
                 $env{'course.'.$tcourseid.'.description'}=$twhere;
             }
             my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid);
-            $twhere.="<br />".&mt('Domain').":".$1;
+            $twhere.="<br />".&mt('Domain').":".$tdom;
             ($roletext,$roletext_end) = &build_roletext($trolecode,$tdom,$trest,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');
         }
     }