ZF-8427: Parse error after update to r19313


Fatal parse error encountered when updating to r19313 of v1.9 release branch.

Problem is a missing parenthesis from, it looks like based on the commit log, a bad merge.

Actual error:

[Mon Nov 30 10:18:08 2009] [error] [client] PHP Parse error: syntax error, unexpected '{' in /home/jcarouth/workspace/mobile/src/library/Zend/Application/Bootstrap/BootstrapAbstract.php on line 354


Patch attached.

Fixed with r19314 Bad reverting related to ZF-8424

It did make it into the ZF 1.9 branch....

which doesn't make for a complete comment :S so continuing here;

... which I find rather disturbing.