Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Neff <benjamin@coding4coffee.ch>2015-07-11 04:14:12 +0300
committerDennis Schubert <mail@dennis-schubert.de>2015-07-14 00:52:13 +0300
commite4ca9f01e207f1375b6e55e35641dcf425c6cb56 (patch)
treeaf3312692989b3d4cf12e59f5b61a656cffa2d8b /app/helpers
parentedc3ac69080f2f472aa9bc86c1b93e7020b5e51d (diff)
fix jsxc_helper_spec and use new url_to in jsxc_helper
closes #6151
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/jsxc_helper.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/helpers/jsxc_helper.rb b/app/helpers/jsxc_helper.rb
index 168faf0ed..222763529 100644
--- a/app/helpers/jsxc_helper.rb
+++ b/app/helpers/jsxc_helper.rb
@@ -3,11 +3,10 @@ module JsxcHelper
port = AppConfig.chat.server.bosh.port
bind = AppConfig.chat.server.bosh.bind
host = AppConfig.pod_uri.host
- scheme = AppConfig.pod_uri.scheme
unless AppConfig.chat.server.bosh.proxy?
return "http://#{host}:#{port}#{bind}"
end
- return "#{scheme}://#{host}#{bind}"
+ AppConfig.url_to bind
end
end