--- loncom/interface/createaccount.pm	2010/12/24 20:36:11	1.40.2.3
+++ loncom/interface/createaccount.pm	2010/12/01 21:38:29	1.43
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.40.2.3 2010/12/24 20:36:11 raeburn Exp $
+# $Id: createaccount.pm,v 1.43 2010/12/01 21:38:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -128,8 +128,7 @@ sub handler {
             return OK;
         } else {
             $start_page = 
-                &Apache::loncommon::start_page($title,$js,
-                                               {'no_inline_link'   => 1,});
+                &Apache::loncommon::start_page($title,$js);
             &print_header($r,$start_page,$courseid);
             $r->print($output);
             &print_footer($r);    
@@ -137,8 +136,8 @@ sub handler {
         }
     }
     $start_page =
-        &Apache::loncommon::start_page($title,$js,
-                                       {'no_inline_link'   => 1,});
+        &Apache::loncommon::start_page($title,$js);
+
     my %domconfig = 
         &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
     my ($cancreate,$statustocreate) = &get_creation_controls($domain,$domconfig{'usercreation'});
@@ -285,7 +284,7 @@ sub selfenroll_crumbs {
     }
     my $last_crumb;
     if ($desc ne '') {
-        $last_crumb = &mt('Self-enroll in [_1]',"<span class='LC_cusr_emph'>$desc</span>");
+        $last_crumb = &mt('Self-enroll in [_1]','<span class="LC_cusr_emph">'.$desc.'</span>');
     } else {
         $last_crumb = &mt('Self-enroll');
     }
@@ -1153,22 +1152,16 @@ sub invalid_state {
     if ($msgtext) {
         $msg .= '<br />'.$msgtext;
     }
-    $msg .= &linkto_email_help($contact_email,$domdesc,$error);
+    $msg .= &linkto_email_help($contact_email,$domdesc);
     return $msg;
 }
 
 sub linkto_email_help {
-    my ($contact_email,$domdesc,$error) = @_;
+    my ($contact_email,$domdesc) = @_;
     my $msg;
-    my $href = '/adm/helpdesk';
     if ($contact_email ne '') {
         my $escuri = &HTML::Entities::encode('/adm/createaccount','&<>"');
-        $href .= '?origurl='.$escuri;
-        if ($error eq 'existinguser') {
-            my $escemail = &HTML::Entities::encode($env{'form.useremail'});
-            $href .= '&useremail='.$escemail.'&useraccount='.$escemail;
-        }
-        $msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','<a href="'.$href.'">','</a>',$domdesc).'<br />';
+        $msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','<a href="/adm/helpdesk?origurl='.$escuri.'">','</a>',$domdesc).'<br />';
     } else {
         $msg .= '<br />'.&mt('You may wish to send an e-mail to the server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc).'<br />';
     }