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

[raeburn]

raeburn		Thu Aug 13 13:28:51 2009 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	lonmenu.pm 
  Log:
  - Backport 1.273.
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.244.2.1 loncom/interface/lonmenu.pm:1.244.2.2
--- loncom/interface/lonmenu.pm:1.244.2.1	Wed May 20 20:11:35 2009
+++ loncom/interface/lonmenu.pm	Thu Aug 13 13:28:51 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.244.2.1 2009/05/20 20:11:35 raeburn Exp $
+# $Id: lonmenu.pm,v 1.244.2.2 2009/08/13 13:28:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1778,8 +1778,9 @@
                    '    numsec['.$i.'] = "'.$seccount->{$items[$i]}.'";'."\n";
         }
     }
-    my $output = <<"END";
+    return <<"END";
 <script type="text/javascript">
+//<![CDATA[
 function adhocRole(roleitem) {
     $js
     var newrole =  document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value;
@@ -1850,11 +1851,9 @@
     }
     return -1;
 }
-
-
+// ]]>
 </script>
 END
-    return $output;
 }