Index: openacs-4/www/blank-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.adp,v
diff -u -r1.24 -r1.25
--- openacs-4/www/blank-master.adp	15 Sep 2007 07:22:40 -0000	1.24
+++ openacs-4/www/blank-master.adp	18 Sep 2007 07:06:33 -0000	1.25
@@ -13,13 +13,9 @@
 <if @head@ not nil>@head;noquote@</if>
 </head>
 <body<if @body.class@ not nil> class="@body.class;noquote@"</if><if @body.id@ not nil> id="@body.id;noquote@"</if><if @event_handlers@ not nil>@event_handlers;noquote@</if>>
-<list name="header">
   @header;noquote@
-</list>
 <slave>
-<list name="footer">
   @footer;noquote@
-</list>
 <multiple name="body_script">    <script type="@body_script.type;noquote@"<if @body_script.src@ not nil> src="@body_script.src;noquote@"</if><if @body_script.charset@ not nil> charset="@body_script.charset;noquote@"</if><if @body_script.defer@ not nil> defer="@body_script.defer;noquote@"</if>><if @body_script.content@ not nil>@body_script.content;noquote@</if></script>
 </multiple>
 
Index: openacs-4/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v
diff -u -r1.24 -r1.25
--- openacs-4/www/blank-master.tcl	15 Sep 2007 07:22:40 -0000	1.24
+++ openacs-4/www/blank-master.tcl	18 Sep 2007 07:06:33 -0000	1.25
@@ -118,11 +118,11 @@
 
 # Generate the head <script /> tag multirow
 variable ::template::head::scripts
-template::multirow create script type src charset defer content
+template::multirow create headscript type src charset defer content
 if {[array exists scripts]} {
     foreach name [array names scripts] {
-        foreach {type src charset script defer} $scripts($name) {
-            template::multirow append script \
+        foreach {type src charset script defer content} $scripts($name) {
+            template::multirow append headscript \
                 $type \
                 $src \
                 $charset \
@@ -169,26 +169,38 @@
  
 # Generate the body headers
 variable ::template::headers
-set header [list]
+set header ""
 if {[info exists headers]} {
-    foreach {type src params} $headers {
+    foreach header_list $headers {
+	set type [lindex $header_list 0]
+	set src [lindex $header_list 1]
+	set params [lindex $header_list 2]
         if {$type eq "literal"} {
-            lappend header $src
-        } else {
-            lappend header [template::adp_include $src $params]
+            append header $src
+        } elseif {$type eq "include"} {
+	    set adp_html  [template::adp_include $src $params]
+	    if {$adp_html ne ""} {
+		append header $adp_html
+	    }
         }
     }
 }
 
 # Generate the body footers
 variable ::template::footers
-set footer [list]
+set footer ""
 if {[info exists footers]} {
-    foreach {type src params} $footers {
+    foreach footer_list $footers {
+	set type [lindex $footer_list 0]
+	set src [lindex $footer_list 1]
+	set params [lindex $footer_list 2]
         if {$type eq "literal"} {
-            lappend footer $src
+            append footer $src
         } else {
-            lappend footer [template::adp_include $src $params]
+	    set adp_html  [template::adp_include $src $params]
+	    if {$adp_html ne ""} {
+		lappend footer
+	    }
         }
     }
 }
\ No newline at end of file