elkarte/Elkarte — pull request #1050 by Spuds (2013-11-18 05:09:13+00:00)
Title: Fixes for 1044 and 1047

fixes #1044
fixes #1047 with @emanuele45 review since that function is his baby