Merge branch 'master' into staging

Leandro Santos
2 parents 59b2e15a 6f6d0855
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
app/views/layouts/application-ng.html.erb
@@ -82,7 +82,7 @@
       </div><!-- end id="global-footer" -->
     </div><!-- end id="footer" -->
     <%= noosfero_layout_features %>
-    <%= addthis_javascript %>
+    <%= addthis_javascript.html_safe %>
     <%=
       str = (@plugins.dispatch(:body_ending).map do |content|
               if content.respond_to?(:call) then
...	...	@@ -82,7 +82,7 @@
82	82	</div><!-- end id="global-footer" -->
83	83	</div><!-- end id="footer" -->
84	84	<%= noosfero_layout_features %>
85		- <%= addthis_javascript %>
	85	+ <%= addthis_javascript.html_safe %>
86	86	<%=
87	87	str = (@plugins.dispatch(:body_ending).map do \|content\|
88	88	if content.respond_to?(:call) then
...	...