Commit 324fe12a authored by Kamil Trzcinski's avatar Kamil Trzcinski Committed by James Edwards-Jones

Fix pages path settings option.

parent 6c9ba469
...@@ -267,7 +267,7 @@ Settings.registry['path'] = File.expand_path(Settings.registry['path' ...@@ -267,7 +267,7 @@ Settings.registry['path'] = File.expand_path(Settings.registry['path'
# #
Settings['pages'] ||= Settingslogic.new({}) Settings['pages'] ||= Settingslogic.new({})
Settings.pages['enabled'] = false if Settings.pages['enabled'].nil? 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['host'] ||= "example.com"
Settings.pages['https'] = false if Settings.pages['https'].nil? Settings.pages['https'] = false if Settings.pages['https'].nil?
Settings.pages['port'] ||= Settings.pages.https ? 443 : 80 Settings.pages['port'] ||= Settings.pages.https ? 443 : 80
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment