Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -N -r1.179.2.3 -r1.179.2.4
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	15 Feb 2007 16:26:35 -0000	1.179.2.3
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	5 Mar 2007 02:48:33 -0000	1.179.2.4
@@ -488,22 +488,30 @@
                 db_1row portal_and_page_info_select {} -column_array portal
 
                 # fake some elements for the <list> in the template
-                foreach region [get_layout_region_list -layout_id $portal(layout_id)] {
+                set regions [get_layout_region_list -layout_id $portal(layout_id)]
+                foreach region $regions {
                     lappend fake_element_ids($region) $portal_id
                 }
 
                 set element_list [array get fake_element_ids]
 
+                # DRB: This is a horrible, short-term (I hope!) hack to allow
+                # the portal config page to work correctly when a page's given
+                # layout is div-based rather than table-based.
+
+                set layout layouts/simple[llength $regions]
+                db_1row layout_id_select {}
+
                 append template "
                 <table class=\"portal-page-config\" bgcolor=#eeeeee border=0 width=\"100%\">
                 <tr valign=middle><td valign=middle>
-                <include src=\"$portal(template)\"
+                <include src=\"$layout\"
                 element_list=\"$element_list\"
                 action_string=@action_string@ portal_id=@portal_id@
                 return_url=\"@return_url@\" element_src=\"@element_src@\"
                 hide_links_p=f
                 page_id=$page_id
-                layout_id=$portal(layout_id)
+                layout_id=$layout_id
                 edit_p=@edit_p@>
                 </td></tr>"
 
Index: openacs-4/packages/new-portal/tcl/portal-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.xql,v
diff -u -N -r1.45.2.2 -r1.45.2.3
--- openacs-4/packages/new-portal/tcl/portal-procs.xql	31 Jan 2007 17:51:27 -0000	1.45.2.2
+++ openacs-4/packages/new-portal/tcl/portal-procs.xql	5 Mar 2007 02:48:33 -0000	1.45.2.3
@@ -94,9 +94,8 @@
         <querytext>
             select portals.name,
                    portals.portal_id,
-                   portal_layouts.filename as template,
                    portal_pages.pretty_name as page_name,
-                   portal_pages.layout_id as layout_id
+                   portal_pages.layout_id
             from portals,
                  portal_layouts,
                  portal_pages
@@ -107,6 +106,14 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="portal::configure.layout_id_select">
+        <querytext>
+            select layout_id
+            from portal_layouts
+            where filename = :layout
+        </querytext>
+    </fullquery>
+
     <fullquery name="portal::configure.sub_portals">
         <querytext>
             select count(*)