[1.5.2] Bug fixes for 1.5 :)

git-svn-id: https://plugins.svn.wordpress.org/sharify/trunk@1035698 b8457f37-d9ea-0310-8a92-e5e31aec5664