Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fixed CDN default host/port when CDN isn't set (#11573)

Damian Legawiec3ff3cef056fe
diff --git a/core/config/routes.rb b/core/config/routes.rb
index 3b3de52ab6..88881a63b9 100644
--- a/core/config/routes.rb
+++ b/core/config/routes.rb
@@ -8,8 +8,8 @@ Rails.application.routes.draw do
model.signed_id,
model.filename,
options.merge(
- host: Spree.cdn_host || Rails.application.config.default_url_options[:host],
- port: Rails.application.config.default_url_options[:port]
+ host: Spree.cdn_host || Rails.application.routes.default_url_options[:host],
+ port: Rails.application.routes.default_url_options[:port]
)
)
else
@@ -23,8 +23,8 @@ Rails.application.routes.draw do
variation_key,
filename,
options.merge(
- host: Spree.cdn_host || Rails.application.config.default_url_options[:host],
- port: Rails.application.config.default_url_options[:port]
+ host: Spree.cdn_host || Rails.application.routes.default_url_options[:host],
+ port: Rails.application.routes.default_url_options[:port]
)
)
end
diff --git a/core/lib/generators/spree/dummy/templates/rails/test.rb b/core/lib/generators/spree/dummy/templates/rails/test.rb
index 077c57e615..6008f39279 100644
--- a/core/lib/generators/spree/dummy/templates/rails/test.rb
+++ b/core/lib/generators/spree/dummy/templates/rails/test.rb
@@ -38,5 +38,5 @@ Dummy::Application.configure do
config.cache_store = :redis_cache_store
- config.default_url_options = { host: 'localhost', port: 3000 }
+ routes.default_url_options = { host: 'localhost', port: 3000 }
end