From e8a436f865d3633c17d116a5ebf84ebc5a0cb00e Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Mon, 25 Jan 2021 15:50:10 -0500
Subject: [PATCH] Fix issue with first return value of
 FetchLinkCardService.html method

https://github.com/tootsuite/mastodon/commit/7f1c56954b46b26b4dadfa92047f1ee5d7f9ad0a
---
 app/services/fetch_link_card_service.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index c9d194c2..4358e8ee 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -49,11 +49,11 @@ class FetchLinkCardService < BaseService
 
     Request.new(:get, @url).add_headers('Accept' => 'text/html').perform do |res|
       if res.code == 200 && res.mime_type == 'text/html'
-        @html = res.body_with_limit
         @html_charset = res.charset
+        @html = res.body_with_limit
       else
-        @html = nil
         @html_charset = nil
+        @html = nil
       end
     end