Small update, logic change, and added security fix

git-svn-id: https://plugins.svn.wordpress.org/theme-to-browser-t2b-control/trunk@994077 b8457f37-d9ea-0310-8a92-e5e31aec5664