Porting Greg's fix for ROL-1983 to the 5.0.x branch.

git-svn-id: https://svn.apache.org/repos/asf/roller/branches/roller_5.0@1569623 13f79535-47bb-0310-9956-ffa450edef68