Undo a commit of Jeroen's from about a week back after talking to him.

I felt the code was clearer the way it was and his only concern was efficiency which should be addressed by caching if it hasn't been already (I need to double check whether these functions are already using the cached data or not ... I'm in the middle of this caching work)

git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@2040 <a class="text" href="/?p=mantisbt.git;a=object;h=f5dc347c">f5dc347c</a>-c33d-0410-90a0-b07cc1902cb9