--- loncom/interface/lonnavmaps.pm	2005/04/11 15:28:55	1.322
+++ loncom/interface/lonnavmaps.pm	2005/04/11 15:33:46	1.323
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.322 2005/04/11 15:28:55 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.323 2005/04/11 15:33:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1588,11 +1588,7 @@ END
 	    my @allres=$navmap->retrieveResources();
 	    foreach my $resource (@allres) {
 		if ($resource->hasDiscussion()) {
-		    my $ressymb = $resource->symb();
-                    if ($ressymb =~ m-___adm/\w+/\w+/\d+/bulletinboard$-) {
-                        $ressymb = $resource->wrap_symb();
-		    }
-		    $haveDisc .= $ressymb.':';
+		    $haveDisc .= $resource->wrap_symb().':';
 		    $totdisc ++;
 		}
 	    }
@@ -2285,11 +2281,8 @@ sub hasDiscussion {
 
     #return defined($self->{DISCUSSION_TIME}->{$symb});
 
-# backward compatibility (bulletin boards used to be 'wrapped')
-    my $ressymb = $symb;
-    if ($ressymb =~ m-___adm/\w+/\w+/\d+/bulletinboard$-) {
-        $ressymb = $self->wrap_symb($ressymb);
-    }
+    # backward compatibility (bulletin boards used to be 'wrapped')
+    my $ressymb = $self->wrap_symb($symb);
     if ( defined ( $self->{LAST_READ}->{$ressymb} ) ) {
         return $self->{DISCUSSION_TIME}->{$ressymb} > $self->{LAST_READ}->{$ressymb};
     } else {