Index: openacs-4/packages/forums-portlet/www/forums-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/forums-portlet/www/forums-portlet.tcl	28 Feb 2008 06:51:49 -0000	1.16
+++ openacs-4/packages/forums-portlet/www/forums-portlet.tcl	9 Nov 2008 23:29:27 -0000	1.17
@@ -37,8 +37,8 @@
 set useReadingInfo [forum::use_ReadingInfo_p]
 if { $useReadingInfo } {
 	set unread_or_new_query {
-		approved_thread_count-COALESCE((SELECT forums_reading_info_user.threads_read WHERE
-			forums_reading_info_user.forum_id=forums_forums_enabled.forum_id AND forums_reading_info_user.user_id=:user_id),0)
+		approved_thread_count-coalesce((SELECT forums_reading_info_user.threads_read from forums_reading_info_user  WHERE
+			forums_reading_info_user.forum_id=forums_forums.forum_id AND forums_reading_info_user.user_id=:user_id),0)
 			as count_unread
     }
 } else {
@@ -47,38 +47,4 @@
 	}
 }
 
-template::list::create -name forums -multirow forums -key forum_id -pass_properties {
-	useReadingInfo
-} -elements {
-    item {
-        label ""
-        display_template {
-        <b>@forums.parent_name@</b><br>
-          <group column="package_id">
-					<if @useReadingInfo@>
-		<if  @forums.count_unread@ gt 0>
-		<strong>
-                </if>
-                 &raquo; <a href="@forums.url@forum-view?forum_id=@forums.forum_id@">@forums.name@</a>
-		<if  @forums.count_unread@ gt 0>
-                  </strong>(@forums.count_unread@)
-		</if>
-		</if>
-		<else>
-              <if @forums.new_p@ eq t>
-	        &raquo; <a href="@forums.url@forum-view?forum_id=@forums.forum_id@">@forums.name@</a>
-                <span class="new_flag">
-                  #forums-portlet.resources_acs-subsite_new_gif#<br>
-                </span>
-              </if>
-              <else>
-	        &raquo; <a href="@forums.url@forum-view?forum_id=@forums.forum_id@">@forums.name@</a><br>
-	      </else>
-		</else>
-
-          </group>
-        }
-    }
-}
-
 db_multirow forums $query {}