Merge pull request #1439 from Alex-Jordan/empty-tags

somiaj · web-flow · commit 7d951869e95a · 2026-06-13T20:44:08.000-06:00
allow empty containers in PGML
diff --git a/macros/core/PGML.pl b/macros/core/PGML.pl
@@ -270,8 +270,8 @@ sub Terminate {
 	}
 	$self->{block} = $prev;
 	if ($block->{stack}) {
-		if    (scalar(@{ $block->{stack} }) == 0) { $prev->popItem }
-		elsif ($block->{combine})                 { $prev->combineTopItems }
+		if    (!$block->{isContainer} && scalar(@{ $block->{stack} }) == 0) { $prev->popItem }
+		elsif ($block->{combine})                                           { $prev->combineTopItems }
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -270,8 +270,8 @@ sub Terminate {`
`270`	`270`	`}`
`271`	`271`	`$self->{block} = $prev;`
`272`	`272`	`if ($block->{stack}) {`
`273`		`- if (scalar(@{ $block->{stack} }) == 0) { $prev->popItem }`
`274`		`- elsif ($block->{combine}) { $prev->combineTopItems }`
	`273`	`+ if (!$block->{isContainer} && scalar(@{ $block->{stack} }) == 0) { $prev->popItem }`
	`274`	`+ elsif ($block->{combine}) { $prev->combineTopItems }`
`275`	`275`	`}`
`276`	`276`	`}`
`277`	`277`