Index: openacs-4/packages/dotlrn/www/manage-memberships.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.tcl,v
diff -u -r1.11.2.2 -r1.11.2.3
--- openacs-4/packages/dotlrn/www/manage-memberships.tcl	12 Dec 2005 16:53:32 -0000	1.11.2.2
+++ openacs-4/packages/dotlrn/www/manage-memberships.tcl	15 Dec 2005 10:38:26 -0000	1.11.2.3
@@ -174,11 +174,22 @@
     append non_member_query "_by_term"
 }
 
+# Is the user a .LRN admin or a sitewide admin
 set swa_p [acs_user::site_wide_admin_p -user_id $user_id] 
+if {!$swa_p} {
+    set swa_p [dotlrn::admin_p -user_id $user_id]
+}
+
 set n_non_member_classes [db_string select_n_non_member_classes {}]
-db_multirow non_member_classes $non_member_query {}
-db_multirow non_member_clubs select_non_member_clubs {}
+db_multirow non_member_classes $non_member_query {} {
+    regsub -all {<p>} $description {<br />} description
+}
 
+db_multirow non_member_clubs select_non_member_clubs {} {
+    regsub -all {<p>} $description {<br />} description
+}
+    
+
 # hack for eabis
 set non_member_club_ids [db_list non_member_club_ids {                select f.club_id
                 from dotlrn_clubs_full f