[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncommon.pm

[raeburn]

raeburn		Sun Jan 23 00:53:02 2022 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11
    - Backport part of 1.1321 and part of 1.1372 omitted in earlier backports. 
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.163 loncom/interface/loncommon.pm:1.1075.2.164
--- loncom/interface/loncommon.pm:1.1075.2.163	Wed Jan 19 00:39:01 2022
+++ loncom/interface/loncommon.pm	Sun Jan 23 00:53:02 2022
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.163 2022/01/19 00:39:01 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.164 2022/01/23 00:53:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4809,6 +4809,9 @@
                 }
             }
         }
+        if (($activity eq 'wishlist') || ($activity eq 'annotate')) {
+            return ();
+        }
     }
     if (defined($udom) && defined($uname)) {
         # If uname and udom are for a course, check for blocks in the course.
@@ -14908,7 +14911,7 @@
         for (my $k=0; $k<@{$cats->[$depth]{$category}}; $k++) {
             my $name = $cats->[$depth]{$category}[$k];
             my $item = &escape($category).':'.&escape($parents->[-1]).':'.$shallower;
-            my $trailstr = join(' -> ',(@{$parents},$category));
+            my $trailstr = join(' » ',(@{$parents},$category));
             if ($allitems->{$item} eq '') {
                 push(@{$trails},$trailstr);
                 $allitems->{$item} = scalar(@{$trails})-1;