[LON-CAPA-cvs] cvs: loncom(version_1_2_X) /interface lonfeedback.pm

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 13 Sep 2004 18:20:38 -0000


albertel		Mon Sep 13 14:20:38 2004 EDT

  Modified files:              (Branch: version_1_2_X)
    /loncom/interface	lonfeedback.pm 
  Log:
  - backport 1.123
  
  
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.99.2.5 loncom/interface/lonfeedback.pm:1.99.2.6
--- loncom/interface/lonfeedback.pm:1.99.2.5	Tue Aug 31 14:33:44 2004
+++ loncom/interface/lonfeedback.pm	Mon Sep 13 14:20:38 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.99.2.5 2004/08/31 18:33:44 albertel Exp $
+# $Id: lonfeedback.pm,v 1.99.2.6 2004/09/13 18:20:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -127,18 +127,24 @@
 
 # Override user's default if user specified display setting for this discussion
     if (defined($dischash{$ondispkey})) {
-        $markondisp = $dischash{$ondispkey};
+	unless ($dischash{$showkey} eq '') {
+	    $markondisp = $dischash{$ondispkey};
+	}
     }
     if ($markondisp) {
         $discinfo{$lastkey} = time;
     }
 
     if (defined($dischash{$showkey})) {
-        $showonlyunread = $dischash{$showkey};
+	unless ($dischash{$showkey} eq '') {
+	    $showonlyunread = $dischash{$showkey};
+	}
     }
 
     if (defined($dischash{$visitkey})) {
-        $visit = $dischash{$visitkey};
+	unless ($dischash{$showkey} eq '') {
+	    $visit = $dischash{$visitkey};
+	}
     }
     $visit ++;