Index: openacs-4/packages/wiki/lib/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/lib/new.tcl,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/wiki/lib/new.tcl 4 Jan 2005 18:01:18 -0000 1.1 +++ openacs-4/packages/wiki/lib/new.tcl 6 Jan 2005 23:37:43 -0000 1.1.2.1 @@ -21,7 +21,7 @@ item_id:key title:text content:text(textarea) - revision_notes:text(textarea) + revision_notes:text(textarea),optional } -edit_request { @@ -60,7 +60,9 @@ # do something clever with internal refs set stream [Wikit::Format::TextToStream $content] set refs [Wikit::Format::StreamToRefs $stream "wiki::info"] - + if {![llength $refs]} { + set refs [list ""] + } db_foreach get_ids "select ci.item_id as ref_item_id from cr_items ci left join cr_item_rels cr on (cr.item_id=:item_id or cr.related_object_id=:item_id) where ci.parent_id=:folder_id and ci.name in ([template::util:::tcl_to_sql_list $refs]) and cr.rel_id is null" { content::item::relate \ -item_id $item_id \ Index: openacs-4/packages/wiki/lib/page.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wiki/lib/page.tcl,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/wiki/lib/page.tcl 4 Jan 2005 18:01:18 -0000 1.1 +++ openacs-4/packages/wiki/lib/page.tcl 6 Jan 2005 23:37:43 -0000 1.1.2.1 @@ -45,16 +45,14 @@ rp_internal_redirect "/packages/wiki/lib/new" } -content::item::get -item_id $item_id -attributes [list [list text ""] [list content ""]] -set revision_id $content_item(revision_id) -set content [db_string get_content "select content from cr_revisions where revision_id=:revision_id" -default ""] +db_1row get_content "select content,title from cr_revisions, cr_items where revision_id=live_revision and cr_items.item_id=:item_id" + set stream [Wikit::Format::TextToStream $content] set refs [Wikit::Format::StreamToRefs $stream "wiki::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" set content [ad_wiki_text_to_html $content "wiki::info"] -set title $content_item(title) set context [list $title] set focus "" set header_stuff ""