From 9374e5d42df4ff30b511ccae5340028e42ab8e5c Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 22 Sep 2016 11:30:19 +0800
Subject: [PATCH] Revert "FIX: don't overwrite category's logo & background
 URLs"

This reverts commit 641b95f655f0f653e3f0602d01729545ae8450ab.
---
 app/controllers/categories_controller.rb      | 26 +------------------
 .../controllers/categories_controller_spec.rb | 20 --------------
 2 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index dc5945f3686..8b59196ef0b 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -132,7 +132,7 @@ class CategoriesController < ApplicationController
 
       render_serialized(@category, CategorySerializer)
     else
-      render_json_error(@category) unless @category.save
+      return render_json_error(@category) unless @category.save
     end
   end
 
@@ -151,10 +151,6 @@ class CategoriesController < ApplicationController
 
       old_permissions = cat.permissions_params
 
-      # remove asset host & cdn from both logo_url and background_url (never trust the client)
-      category_params[:logo_url] = fix_upload_url(category_params[:logo_url])
-      category_params[:background_url] = fix_upload_url(category_params[:background_url])
-
       if result = cat.update_attributes(category_params)
         Scheduler::Defer.later "Log staff action change category settings" do
           @staff_action_logger.log_category_settings_change(@category, category_params, old_permissions)
@@ -262,24 +258,4 @@ class CategoriesController < ApplicationController
       params[:include_topics] ||
       SiteSetting.desktop_category_page_style == "categories_with_featured_topics".freeze
     end
-
-    def fix_upload_url(url)
-      return if url.blank?
-
-      if Discourse.asset_host.present?
-        asset_host = UrlHelper.schemaless(Discourse.asset_host)
-        url.sub!(/^(https?:)?#{Regexp.escape(asset_host)}/, "")
-      end
-
-      if SiteSetting.enable_s3_uploads? && SiteSetting.s3_cdn_url.present?
-        s3_cdn_url = UrlHelper.schemaless(SiteSetting.s3_cdn_url)
-        url.sub!(/^(https?:)?#{Regexp.escape(s3_cdn_url)}/, Discourse.store.absolute_base_url)
-      end
-
-      base_url = UrlHelper.schemaless(Discourse.base_url_no_prefix)
-      url.sub!(/^(https?:)?#{Regexp.escape(base_url)}/, "")
-
-      url
-    end
-
 end
diff --git a/spec/controllers/categories_controller_spec.rb b/spec/controllers/categories_controller_spec.rb
index 2f2e6f7f782..4850d5f36ac 100644
--- a/spec/controllers/categories_controller_spec.rb
+++ b/spec/controllers/categories_controller_spec.rb
@@ -230,26 +230,6 @@ describe CategoriesController do
 
           expect(UserHistory.count).to eq(5) # 2 + 3 (bootstrap mode)
         end
-
-        it "fix both logo and background urls" do
-          Discourse.stubs(:asset_host).returns("http://foo.bar")
-          Discourse.stubs(:base_url_no_prefix).returns("http://bar.foo")
-
-          upload = build(:upload)
-
-          xhr :put, :update, id: @category.id,
-                             name: @category.name,
-                             color: @category.color,
-                             text_color: @category.text_color,
-                             slug: @category.slug,
-                             logo_url: UrlHelper.schemaless(UrlHelper.absolute(upload.url)),
-                             background_url: UrlHelper.absolute_without_cdn(upload.url)
-
-          @category.reload
-          expect(@category.logo_url).to eq(upload.url)
-          expect(@category.background_url).to eq(upload.url)
-        end
-
       end
     end