Oops, misread something somewhere...  I *did* change that line...

As to updating the parent ```if```, that would work if we weren't attempting to output headers in both conditions.  I can change the ```else``` to an ```elseif ( ! headers_sent())``` fairly easily, and I suspect that's what you intended, but I wanted to bring that up in case you'd missed it.  I know you're pretty swamped with a project this size.  :)