Updated PR for tracker #28256.

This is an updated PR and closes #1734.

http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=28256