Index: openacs-4/contrib/packages/portal/tcl/element-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/element-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/portal/tcl/element-procs.tcl	8 Jan 2004 02:12:19 -0000	1.3
+++ openacs-4/contrib/packages/portal/tcl/element-procs.tcl	10 Jan 2004 01:01:01 -0000	1.4
@@ -384,7 +384,7 @@
         ]
 
         array set config [list \
-            shaded_p [util_decode $element(state) shaded t f] \
+            shaded_p [ad_decode $element(state) shaded t f] \
             shadeable_p $element(shadeable_p) \
             hideable_p $element(hideable_p) \
         ]
Index: openacs-4/contrib/packages/portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/portal-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	8 Jan 2004 02:12:19 -0000	1.3
+++ openacs-4/contrib/packages/portal/tcl/portal-procs.tcl	10 Jan 2004 01:01:01 -0000	1.4
@@ -232,16 +232,17 @@
         db_1row portal_select {} -column_array portal
         set page_id $portal(page_id)
 
-        set element_ids [list]
         db_foreach element_select {} -column_array entry {
             lappend element_ids($entry(region)) $entry(element_id)
+        } if_no_rows {
+            set element_ids {}
         }
 
         set element_list [array get element_ids]
 
         # set up the template, it includes the layout template,
         # which in turn includes the theme, then elements
-        if {[empty_string_p $element_list]} {
+        if {[string match "" $element_list]} {
             # The portal has no elements, show anyway (they can configure)
             set template "<master src=\"@master_template@\">
             <property name=\"title\">@portal.name@</property>"
@@ -265,6 +266,7 @@
 
         # compile and evaluate the template
         set code [template::adp_compile -string $template]
+
         return [template::adp_eval code]
     }
 
Index: openacs-4/contrib/packages/portal/tcl/theme-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/theme-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/tcl/theme-procs.xql	8 Jan 2004 02:12:19 -0000	1.2
+++ openacs-4/contrib/packages/portal/tcl/theme-procs.xql	10 Jan 2004 01:01:01 -0000	1.3
@@ -2,7 +2,7 @@
 
 <queryset>
 
-    <fullquery name="portal::theme::get.select_theme">
+    <fullquery name="portal::theme::get_not_cached.select_theme">
         <querytext>
             select *
             from portal_themes
Index: openacs-4/contrib/packages/portal/www/place-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/Attic/place-element.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/www/place-element.adp	22 May 2003 15:07:52 -0000	1.2
+++ openacs-4/contrib/packages/portal/www/place-element.adp	10 Jan 2004 01:01:01 -0000	1.3
@@ -88,12 +88,14 @@
 
 </if>
 
+<if 0>
 	<include src="show-here" portal_id=@portal_id;noquote@
 		action_string=@action_string;noquote@
 		region=@region;noquote@
 		page_id=@page_id;noquote@
 		anchor=@page_id;noquote@
 		return_url=@return_url;noquote@>
+</if>
 
 </td>
 </tr>
Index: openacs-4/contrib/packages/portal/www/admin/portal-config.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/admin/Attic/portal-config.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/www/admin/portal-config.adp	22 May 2003 15:08:10 -0000	1.2
+++ openacs-4/contrib/packages/portal/www/admin/portal-config.adp	10 Jan 2004 01:01:01 -0000	1.3
@@ -25,10 +25,5 @@
 
 <a href=@page_url@?&portal_id=@portal_id@&referer=@referer@&anchor=#custom>Manage Custom Portlets</a>
 
-@rendered_page@
+@rendered_page;noquote@
 <hr>
-
-<a name="custom"><h2></a>Custom Portlets</h2> - Note custom portlets for portal templates are very fragile right now. Only use this during system set up before any portlets have been created with this template.  Better solution coming soon.
-<include src="/packages/static-portlet/www/static-admin-portlet" package_id="@portal_id;noquote@" template_portal_id="@portal_id;noquote@" return_url="@return_url;noquote@">
-
-
Index: openacs-4/contrib/packages/portal/www/render-styles/all-in-one/render-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/render-styles/all-in-one/Attic/render-element.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/www/render-styles/all-in-one/render-element.adp	22 May 2003 15:08:42 -0000	1.2
+++ openacs-4/contrib/packages/portal/www/render-styles/all-in-one/render-element.adp	10 Jan 2004 01:01:01 -0000	1.3
@@ -27,5 +27,5 @@
 
 <ul>
 <li><b>@element.name@</b><br>
-@element.content@
+@element.content;noquote@
 </ul>
Index: openacs-4/contrib/packages/portal/www/render-styles/individual/render-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/render-styles/individual/Attic/render-element.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/www/render-styles/individual/render-element.adp	22 May 2003 15:09:07 -0000	1.2
+++ openacs-4/contrib/packages/portal/www/render-styles/individual/render-element.adp	10 Jan 2004 01:01:01 -0000	1.3
@@ -27,5 +27,5 @@
 <property name="shaded_p">@element.shaded_p;noquote@</property>
 <property name="hideable_p">@element.hideable_p;noquote@</property>
 
-@element.content@
+@element.content;noquote@
 </if>
Index: openacs-4/contrib/packages/portal/www/render-styles/individual/render-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/render-styles/individual/Attic/render-element.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/www/render-styles/individual/render-element.tcl	25 Oct 2002 21:29:17 -0000	1.1
+++ openacs-4/contrib/packages/portal/www/render-styles/individual/render-element.tcl	10 Jan 2004 01:01:01 -0000	1.2
@@ -34,7 +34,7 @@
     # If the error is in the element's "show" proc, the error will
     # be shown in the content of the portlet. This is for errors other
     # than with the "show" proc. It hides the entire PE
-    ns_log error "\n\n *** Error in portal/www/render_sytles_/indiviudal/render-element.tcl \n Uncaught exception when calling portal::element::render \n with element_id $element_id\n\n"
+    ns_log error "\n\n *** Error in portal/www/render_styles_/individual/render-element.tcl \n Uncaught exception when calling portal::element::render \n with element_id $element_id\nError message: $errmsg\n\n"
     array set element {content {}}
 
 } else {