[LON-CAPA-cvs] cvs: loncom /xml lonxml.pm

[www]

www		Wed Dec 28 13:15:00 2011 EDT

  Modified files:              
    /loncom/xml	lonxml.pm 
  Log:
  Don't show discussions when previewing a resource that is already in the course
  
  
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.527 loncom/xml/lonxml.pm:1.528
--- loncom/xml/lonxml.pm:1.527	Fri Dec  9 21:21:43 2011
+++ loncom/xml/lonxml.pm	Wed Dec 28 13:15:00 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.527 2011/12/09 21:21:43 www Exp $
+# $Id: lonxml.pm,v 1.528 2011/12/28 13:15:00 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -210,8 +210,12 @@
     my $discussion;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					   ['LONCAPA_INTERNAL_no_discussion']);
-    if (! exists($env{'form.LONCAPA_INTERNAL_no_discussion'}) ||
-        $env{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true') {
+    if (
+           (   (!exists($env{'form.LONCAPA_INTERNAL_no_discussion'})) 
+            || ($env{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true')
+           ) 
+        && ($env{'form.inhibitmenu'} ne 'yes')
+       ) {
         $discussion=&Apache::lonfeedback::list_discussion($mode,$status);
     }
     if ($target eq 'tex') {