Merge pull request #1523 from dbarbera/avatar_formats_fix

add image authorization on upload_avatar

spec/controllers/users_controller_spec.rb

@@ -966,6 +966,12 @@ describe UsersController do
         response.status.should eq 413
       end
 
+      it 'rejects unauthorized images' do
+        SiteSetting.stubs(:authorized_image?).returns(false)
+        xhr :post, :upload_avatar, username: user.username, file: avatar
+        response.status.should eq 422
+      end
+
       it 'is successful' do
         upload = Fabricate(:upload)
         Upload.expects(:create_for).returns(upload)