Off-line Contribution Receipt Line-Items Garbled - Regression of CRM-13421

We are experiencing the return of the bug that was originally reported in CRM-13421. Once again I discovered this when one of our clients started marking Pending event payments as complete and checked the send receipt box. They started getting complaints that the emails were coming up cryptic. During our investigation we discovered that it was happening any time the check box to send a receipt was checked on a contribution with line items. It didn't matter what type the contribution was, the receipt would look like the following.

This was originally resolved by Pradeep on September 24th with a patch that made sure that line 1049 of CRM/Contribute/Form/Contribution.php read:

$this->_lineItems[] = CRM_Price_BAO_LineItem::getLineItems($entityID, 'participant', 1);

whereas previously $this->_lineItems was not being made an array (https://github.com/pradpnayak/civicrm-core/commit/c51ee8e27ff3cedb4f6c55f1010456c7814c30f3). Checking the core code for 4.5 though that line has been reset to

$this->_lineItems = CRM_Price_BAO_LineItem::getLineItems($entityID, 'participant', 1);

It looks like a regression may have occurred that same day (Sept 24th) when kurund merged branches (https://github.com/civicrm/civicrm-core/commit/03a8c3dcf5d8c3fe76a0551cbdfea259fc40e101#diff-0573f78042d230ffc1d5e61c1749ae77)

In the current version of the file the line in question is 1069. I will submit a pull request shortly after submitting this, I just want to be able to put the bug number in the comments.