--- loncom/interface/loncommon.pm	2002/09/13 20:46:09	1.67
+++ loncom/interface/loncommon.pm	2002/09/17 15:21:51	1.69
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.67 2002/09/13 20:46:09 www Exp $
+# $Id: loncommon.pm,v 1.69 2002/09/17 15:21:51 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -981,7 +981,7 @@ sub nickname {
     my ($uname,$udom)=@_;
     my %names=&Apache::lonnet::get('environment',
   ['nickname','firstname','middlename','lastname','generation'],$udom,$uname);
-    my $name=&Apache::lonnet::unescape($names{'nickname'});
+    my $name=$names{'nickname'};
     if ($name) {
        $name='"'.$name.'"'; 
     } else {
@@ -1000,7 +1000,7 @@ sub screenname {
     my ($uname,$udom)=@_;
     my %names=
  &Apache::lonnet::get('environment',['screenname'],$udom,$uname);
-    return &Apache::lonnet::unescape($names{'screenname'});
+    return $names{'screenname'};
 }
 
 # ------------------------------------------------------------- Message Wrapper
@@ -1013,8 +1013,8 @@ sub messagewrapper {
 # ------------------------------------------------------------- Aboutme Wrapper
 
 sub aboutmewrapper {
-    my ($link,$un,$do)=@_;
-    return "<a href='/adm/$do/$un/aboutme'>$link</a>";
+    my ($link,$username,$domain)=@_;
+    return "<a href='/adm/$domain/$username/aboutme'>$link</a>";
 }
 
 # ------------------------------------------------------------ Syllabus Wrapper