Make Template.contentBlock consistent

[znewsham]

Currently, content rendered in {{> Template.contentBlock}} behaves differently depending on whether data is passed in:

<template name="goodTemplate">
  {{>Template.contentBlock}}
</template>

<template name="badTemplate">
  {{>Template.contentBlock someData}}
</template>

<template name="whatever">
{{#each thing in things}}
  {{#goodTemplate}}
    {{thing}} {{!-- thing will exist}}
  {{/goodTemplate}}

  {{#badTemplate}}
    {{thing}} {{!-- thing will not exist}}
  {{/badTemplate}}
{{/each}}
</template>
...

This PR fixes this situation by checking if the immediate parent is a with and the grandparent is a InOuterTemplateScope (in addition to if the parent is InOuterTemplateScope)

It also makes a readability change - that while statement was hard to parse.

[StorytellerCZ]

Nice, can you please update the chagelog as well?

[znewsham]

@StorytellerCZ done - not sure when it will be released, so left it as 2022-XXX

[StorytellerCZ]

Alright, I'll see if I can spare more time to take a deeper look. If everything works great, then I would like to have this as a final piece for 2.6 release.

[jankapunkt]

I would personally break the lines for better readability but that's optional, since we have no definite linter yet (I think)

[jankapunkt]

Is this to be included in 2.6?

[StorytellerCZ]

@jankapunkt if it is to be merged, then yes. Could go out as a patch, I think.

[fredmaiaarantes]

@jankapunkt if it is to be merged, then yes. Could go out as a patch, I think.

If what's missing for version 2.6 is done soon, this can be merged into version 2.6.