Merge remote-tracking branch 'origin/master'

Weblate
2 parents 6dd5b8a1 cd62616e
Showing 2 changed files with 13 additions and 5 deletions Show diff stats
config/initializers/noosfero_urls.rb
vendor/plugins/noosfero_urls/init.rb
@@ -0,0 +1,13 @@
+if Rails.env == 'development'
+  ActionController::Base.send(:prepend_before_filter) do |controller|
+    # XXX note that this is not thread-safe! Accessing a Noosfero instance in
+    # development mode under different ports concurrently _will_ lead to weird
+    # things happening.
+    if [80,443].include?(controller.request.port)
+      url_options = {}
+    else
+      url_options = { :port => controller.request.port }
+    end
+    Noosfero.instance_variable_set('@development_url_options', url_options)
+  end
+end
@@ -1,5 +0,0 @@
-if Rails.env == 'development'
-  ActionController::Base.send(:prepend_before_filter) do |controller|
-    Noosfero.instance_variable_set('@development_url_options', { :port => controller.request.port })
-  end
-end
...	...	@@ -0,0 +1,13 @@
	1	+if Rails.env == 'development'
	2	+ ActionController::Base.send(:prepend_before_filter) do \|controller\|
	3	+ # XXX note that this is not thread-safe! Accessing a Noosfero instance in
	4	+ # development mode under different ports concurrently _will_ lead to weird
	5	+ # things happening.
	6	+ if [80,443].include?(controller.request.port)
	7	+ url_options = {}
	8	+ else
	9	+ url_options = { :port => controller.request.port }
	10	+ end
	11	+ Noosfero.instance_variable_set('@development_url_options', url_options)
	12	+ end
	13	+end
...	...
...	...	@@ -1,5 +0,0 @@
1		-if Rails.env == 'development'
2		- ActionController::Base.send(:prepend_before_filter) do \|controller\|
3		- Noosfero.instance_variable_set('@development_url_options', { :port => controller.request.port })
4		- end
5		-end