Index: openacs-4/packages/wiki/lib/page.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/lib/page.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/wiki/lib/page.tcl	22 Feb 2005 16:15:13 -0000	1.3
+++ openacs-4/packages/wiki/lib/page.tcl	13 Jun 2005 09:48:50 -0000	1.4
@@ -5,8 +5,8 @@
     revision_id:optional
 }
 
-# 
-#
+
+
 # Show or edit wiki pages
 #
 # @author Dave Bauer (dave@thedesignexperience.org)
@@ -16,7 +16,7 @@
 
 set folder_id [wiki::get_folder_id]
 set name [ad_conn path_info]
-if {$name eq ""} {
+if {$name == ""} {
     # the path resolves directly to a site node
     set name "index"
 }
@@ -51,21 +51,67 @@
 }
 
 
-db_1row get_content "select content,title from cr_revisions, cr_items where revision_id=live_revision and cr_items.item_id=:item_id"
+if {![info exists revision_id]} {
+    db_1row get_content "
+    	select 
+		content,
+		title 
+    	from 
+		cr_revisions, 
+		cr_items 
+    	where 
+		revision_id = latest_revision 
+		and cr_items.item_id=:item_id
+    "
+} else {
+    db_1row get_content "
+    	select 
+		content,
+		title 
+    	from 
+		cr_revisions
+    	where 
+		revision_id = :revision_id
+    "
+}
 
+
 set stream [Wikit::Format::TextToStream $content]
 set refs [Wikit::Format::StreamToRefs $stream "wiki::get_info"]
-db_multirow related_items get_related_items "select cr.name, cr.title, cr.description from cr_revisionsx cr, cr_items ci, cr_item_rels cir where cir.related_object_id=:item_id and cir.relation_tag='wiki_reference' and ci.live_revision=cr.revision_id and ci.item_id=cir.item_id"
 
+db_multirow related_items get_related_items "
+	select distinct
+		cr.name, 
+		cr.title, 
+		cr.description 
+	from 
+		cr_revisionsx cr, 
+		cr_items ci, 
+		cr_item_rels cir 
+	where 
+		cir.related_object_id=:item_id 
+		and cir.relation_tag='wiki_reference' 
+		and ci.live_revision=cr.revision_id 
+		and ci.item_id=cir.item_id
+"
+
 set content [ad_wiki_text_to_html $content "wiki::get_info"]
 set context [list $title]
 set focus ""
 set header_stuff ""
+set page_title $title
 
 set edit_link_p [permission::permission_p \
                  -object_id $item_id \
                  -party_id [ad_conn user_id] \
                  -privilege "write"
              ]
 
-ad_return_template "page"
+set edit_link_p "t"
+
+set admin_p [permission::permission_p \
+                 -object_id $folder_id \
+                 -party_id [ad_conn user_id] \
+                 -privilege "admin"
+             ]
+