Payment fields should not be suppressed if registering for an event with approval required

CRM-12279 suppressed the payment fields for registration where an event requires approval (as well as an event on a wait list):
https://issues.civicrm.org/jira/browse/CRM-12279

However, this causes an error at the confirmation screen, which tries to display the selected fee when no fee has been selected. This error has been described on the forum post http://forum.civicrm.org/index.php/topic,35929.0.html

It looks like removing "|| $this->_requireApproval" from line 97 of CRM/Event/Form/Registration/Register.php would sort it out. Maybe other changes are needed too?

This would be a partial reversal of the changes made in CRM-12279. There is no need to withhold the fee selection from the registration screen, because actual payment is not made until after the registration is approved by an administrator.