[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncommon.pm

raeburn raeburn at source.lon-capa.org
Sun Feb 23 17:39:22 EST 2014


raeburn		Sun Feb 23 22:39:22 2014 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11
    - Backport 1.1178
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.67 loncom/interface/loncommon.pm:1.1075.2.68
--- loncom/interface/loncommon.pm:1.1075.2.67	Sat Feb 22 00:02:13 2014
+++ loncom/interface/loncommon.pm	Sun Feb 23 22:39:21 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.67 2014/02/22 00:02:13 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.68 2014/02/23 22:39:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5068,7 +5068,10 @@
     @design{keys(%$addentries)} = @$addentries{keys(%$addentries)}; 
 
  # role and realm
-    my ($role,$realm) = split(/\./,$env{'request.role'},2);
+    my ($role,$realm) = split(m{\./},$env{'request.role'},2);
+    if ($realm) {
+        $realm = '/'.$realm;
+    }
     if ($role  eq 'ca') {
         my ($rdom,$rname) = ($realm =~ m{^/($match_domain)/($match_username)$});
         $realm = &plainname($rname,$rdom);




More information about the LON-CAPA-cvs mailing list