Better handling of accidental addition of default ToS/FAQ/privacy to tos_url/faq_url/privacy_url admin settings

[simon]

I can reproduce this on my site if I set the faq url or tos url site settings to the default FAQ and TOS urls for my site. Can you check your site settings to see if that is causing the problem for you? These settings should be left empty if you want to use the default URLs for these pages.