Fix issue #4702
Fix codestyle
Merge pull request #4721 from joomdonation/staging

Fix issue #4702