Changeset 8310

Timestamp:

07/26/10 07:22:31 (3 years ago)

Author:

PaulHarvey

Message:

Item9317: Fix RENDERZONE a bit, doc updates

Location:

trunk/core

Files:

• data/System/VarADDTOZONE.txt (modified) (1 diff)
• data/System/VarRENDERZONE.txt (modified) (1 diff)
• lib/Foswiki.pm (modified) (1 diff)

trunk/core/data/System/VarADDTOZONE.txt

@@ -46 +46 @@
 
 ---++++ Working with ={OptimizePageLayout}= disabled (default)
-   * Be aware that in this mode, =body= is an alias for =head= - no =body= zone is ever populated.
+   * Be aware that in this mode, =body= and =head= are separate zones
+     when adding to them, but merged as one when you call
+     [[VarRENDERZONE][RENDERZONE]]. This allows an ADDTOZONE to the
+     =head= to successfully require an =id= that has been added to the
+     =body=.
+      * %ICON{"info"}% =%<nop>RENDERZONE{"head"}%= will expand *both*
+         =head= and =body= zone content. =%<nop>RENDERZONE{"body"}%= will
+         be empty.
    * Only add HTML to the body zone _that is also legal in the =&lt;HEAD&gt;=._
 

trunk/core/data/System/VarRENDERZONE.txt

@@ -10 +10 @@
 
 Parameters:
-   * ="zone"= required, name of the zone
+   * ="zone"= required, name of the zone.
+      * %ICON{"info"}% If ={OptimizePageLayout}= is *not* enabled in
+         [[%SCRIPTURL{"configure"}%/configure][configure]] (the default),
+         =%<nop>RENDERZONE{"head"}%= will expand both =head= and =body=
+         zone content. =%<nop>RENDERZONE{"body"}%= will be empty. 
    * =header="..."= optional, prefix format string
    * =format="..."= optional, format string for each item added to the zone, default:

trunk/core/lib/Foswiki.pm

@@ -3340 +3340 @@
     # zones as merged for compatibility with ADDTOHEAD usage where requirements
     # have been moved to the body zone. See ZoneTests/Item9317
-    if ( not $Foswiki::cfg{OptimizePageLayout} and $zone eq 'head' ) {
+    if ( not $Foswiki::cfg{OptimizePageLayout}
+        and ( $zone eq 'head' or $zone eq 'body' ) )
+    {
         @zoneIDs = ( @zoneIDs, values %{ $this->{_zones}{body} } );
         foreach my $zoneID (@zoneIDs) {