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

albertel lon-capa-cvs@mail.lon-capa.org
Fri, 24 Oct 2003 21:04:21 -0000 

albertel		Fri Oct 24 17:04:21 2003 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm 
    /loncom/homework	structuretags.pm 
  Log:
  - Fixe for BUG#2280 is wrong, need to call registerurl to get the openbrowser etc helper routines.
  
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.95 loncom/interface/lonmenu.pm:1.96
--- loncom/interface/lonmenu.pm:1.95	Thu Sep 25 13:52:26 2003
+++ loncom/interface/lonmenu.pm	Fri Oct 24 17:04:21 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.95 2003/09/25 17:52:26 bowersj2 Exp $
+# $Id: lonmenu.pm,v 1.96 2003/10/24 21:04:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -203,7 +203,9 @@
     }
 # Graphical display after login only
     if ($Apache::lonxml::registered && !$forcereg) { return ''; }
-    $result.=&innerregister($forcereg,$target);
+    if ($target ne 'edit') {
+	$result.=&innerregister($forcereg,$target);
+    }
     return $result.$force_title;
 }
 
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.217 loncom/homework/structuretags.pm:1.218
--- loncom/homework/structuretags.pm:1.217	Mon Oct 13 20:21:12 2003
+++ loncom/homework/structuretags.pm	Fri Oct 24 17:04:21 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.217 2003/10/14 00:21:12 albertel Exp $
+# $Id: structuretags.pm,v 1.218 2003/10/24 21:04:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -84,10 +84,7 @@
     if (!defined($found{'html'})) {
 	$result=&Apache::londefdef::start_html($target,$token,$tagstack,
 					       $parstack,$parser,$safeeval);
-	$head_tag_start='<head>';
-	if ($ENV{'request.state'} eq 'published') {
-	    $head_tag_start.=&Apache::lonmenu::registerurl(undef,$target);
-	}
+	$head_tag_start='<head>'.&Apache::lonmenu::registerurl(undef,$target);
     }
     my $body_tag_start;
     if (!defined($found{'body'})) {