Download as
Browse Code »

Commit 949339eb7f5f8392c6c448d31ba59baec1c2c2e5

Authored by Antonio Terceiro
1 parent c6761125
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

s/and/&&/

Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @949339e
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 <% 3 <%
4 # AddThis Button 4 # AddThis Button
5 - if block_given? and web2_conf['addthis'] 5 + if block_given? && web2_conf['addthis']
6 opts = web2_conf['addthis'] 6 opts = web2_conf['addthis']
7 %> 7 %>
8 <div id="addThis"> 8 <div id="addThis">
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 </div> 76 </div>
77 <% end %> 77 <% end %>
78 78
79 -<% if profile.enterprise? and !profile.enabled? and !profile.blocks.select {|b| b.class == DisabledEnterpriseMessageBlock}.any? %> 79 +<% if profile.enterprise? && !profile.enabled? && !profile.blocks.select {|b| b.class == DisabledEnterpriseMessageBlock}.any? %>
80 <div id='profile-disabled'> 80 <div id='profile-disabled'>
81 <%= environment.message_for_disabled_enterprise %> 81 <%= environment.message_for_disabled_enterprise %>
82 </div> 82 </div>
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 </div> 96 </div>
97 <% end %> 97 <% end %>
98 98
99 -<% if ! @page.source.nil? and ! @page.source.empty?%> 99 +<% if ! @page.source.nil? && ! @page.source.empty?%>
100 <div id="article-source"> 100 <div id="article-source">
101 <%= _('Source: %s') % link_to(@page.source, @page.source) %> 101 <%= _('Source: %s') % link_to(@page.source, @page.source) %>
102 </div> 102 </div>