Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v diff -u -r1.93 -r1.94 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 9 May 2007 18:37:49 -0000 1.93 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 10 May 2007 00:18:46 -0000 1.94 @@ -83,7 +83,7 @@ ::Generic::Attribute new -attribute_name form_constraints -datatype text \ -pretty_name "Form Constraints" } \ - -form ::xowiki::WikiForm + -form ::xowiki::FormForm ::Generic::CrClass create FormInstance -superclass PageInstance \ -pretty_name "XoWiki FormInstance" -pretty_plural "XoWiki FormInstances" \ -table_name "xowiki_form_instance" -id_column "xowiki_form_instance_id" \ @@ -136,7 +136,7 @@ # # Page definitions # - + Page parameter { page_id {creator ""} @@ -513,7 +513,11 @@ regexp {^([^|]+)[|](.*)$} $label _ label options if {[string match "http*//*" $link] || [string match "//*" $link]} { regsub {^//} $link / link - return "$ch$label" + set l [ExternalLink new -label $label -href $link] + eval $l configure $options + set html [$l render] + $l destroy + return "$ch$html" } set name ""