Changed framing so null will not be auto-included in arrays.

This commit is contained in:
Dave Longley 2011-07-29 14:38:06 -04:00
parent 5d03e650ec
commit 6810f94673

View file

@ -2672,10 +2672,10 @@ function _frame($subjects, $input, $frame, $embeds, $options)
{
if($v === null)
{
if(!$omitOn)
// do not auto-include null in arrays
if(!$omitOn and property_exists($f, '$default'))
{
$tmp[] = property_exists($f, '$default') ?
$f->{'$default'} : null;
$tmp[] = $f->{'$default'};
}
}
else