[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm

[raeburn]

raeburn		Sat Dec 22 14:57:20 2012 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm 
  Log:
  - Assign the response from &prepare_functions() and &clear() to a scalar 
    when needed.
  - Flexibility in resurl for aboutme page.
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.398 loncom/interface/lonmenu.pm:1.399
--- loncom/interface/lonmenu.pm:1.398	Fri Dec  7 17:15:56 2012
+++ loncom/interface/lonmenu.pm	Sat Dec 22 14:57:20 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.398 2012/12/07 17:15:56 raeburn Exp $
+# $Id: lonmenu.pm,v 1.399 2012/12/22 14:57:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -487,8 +487,7 @@
                 }
                 my $trail;
                 if ($env{'form.folderpath'}) {
-                    my $editbutton =
-                        &prepare_functions($resurl,$forcereg,$group,undef,undef,1);
+                    &prepare_functions($resurl,$forcereg,$group,undef,undef,1);
                     ($trail) =
                         &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
                 } else {
@@ -525,7 +524,7 @@
         $editbutton = &prepare_functions($resurl,$forcereg,$group);
     }
     if ($editbutton eq '') {
-        &clear(6,1);
+        $editbutton = &clear(6,1);
     }
 
 #
@@ -860,7 +859,7 @@
                                               $forceedit,$forceview,$forcereg,
                                               $env{'form.title'},$env{'form.suppurl'});
             }
-        } elsif ($resurl !~ m{^adm/($match_domain)/($match_username)/aboutme$}) {
+        } elsif ($resurl !~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
             if ($env{'request.filename'}) {
                 my $file=&Apache::lonnet::declutter($env{'request.filename'});
                 ($cfile,$home,$switchserver,$forceedit,$forceview) =