Fix pages path settings option.

324fe12a · Kamil Trzcinski · James Edwards-Jones · 6c9ba469 · 324fe12a
Commit 324fe12a authored Dec 18, 2015 by Kamil Trzcinski Committed by James Edwards-Jones Jan 31, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

config/initializers/1_settings.rb config/initializers/1_settings.rb +1 -1

No files found.
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -267,7 +267,7 @@ Settings.registry['path']            = File.expand_path(Settings.registry['path'
 #
 Settings['pages'] ||= Settingslogic.new({})
 Settings.pages['enabled']         = false if Settings.pages['enabled'].nil?
-Settings.pages['path']            ||= File.expand_path('shared/pages/', Rails.root)
+Settings.pages['path']            = File.expand_path(Settings.pages['path'] || File.join(Settings.shared['path'], "pages"), Rails.root)
 Settings.pages['host']            ||= "example.com"
 Settings.pages['https']           = false if Settings.pages['https'].nil?
 Settings.pages['port']            ||= Settings.pages.https ? 443 : 80