bug 893: removed returns from some functions in includes/temp_functions.php
Merge branch 'bug-893' into testserver-stable