diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-07-03 19:52:48 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-07-03 19:52:48 +0400 |
commit | 51f174b97f686397bc7299c16a64fda14d5bc718 (patch) | |
tree | 75cf5c6a8625ff97119dcda4cc45a11b8e56c873 /config | |
parent | 00ef16a66c3865e534004d236052f8b13f5a6735 (diff) |
fix port issue
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/1_settings.rb | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index fb039e9e710..8b9ed8aebd6 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -20,17 +20,25 @@ class Settings < Settingslogic def web_port if web.https - nil + web['port'] = 443 else web['port'] ||= 80 - end + end.to_i + end + + def web_custom_port? + ![443, 80].include?(web_port) end def build_url raw_url = self.web_protocol raw_url << "://" raw_url << web_host - raw_url << ":#{web_port}" if web_port.to_i != 80 + + if web_custom_port? + raw_url << ":#{web_port}" + end + raw_url end |