Comment 2 for bug 788309

I changed the subject of this bug because actually I think it's fine for the in-tree site templates to still be searched, just that if the template exists in $var_dir, it should override. And this should be true of the domain templates as well.

Thanks for the patch, and the bug report. Perhaps you'd like to refine the patch to match the new description? Also, if you could include unittests that would be great.