Elgg/Elgg — pull request #5808 by cash (2013-07-14 18:20:04+00:00)
Title: Fixes #5043 Photo uploading from ckeditor

This is a rebase of #5653 and replaces #5805

To test, deactivate and activate the ckeditor plugin.