Download as
Browse Code »

Commit 949339eb7f5f8392c6c448d31ba59baec1c2c2e5

Authored by Antonio Terceiro
1 parent c6761125
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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 2  
3 3 <%
4 4 # AddThis Button
5   - if block_given? and web2_conf['addthis']
  5 + if block_given? && web2_conf['addthis']
6 6 opts = web2_conf['addthis']
7 7 %>
8 8 <div id="addThis">
... ... @@ -76,7 +76,7 @@
76 76 </div>
77 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 80 <div id='profile-disabled'>
81 81 <%= environment.message_for_disabled_enterprise %>
82 82 </div>
... ... @@ -96,7 +96,7 @@
96 96 </div>
97 97 <% end %>
98 98  
99   -<% if ! @page.source.nil? and ! @page.source.empty?%>
  99 +<% if ! @page.source.nil? && ! @page.source.empty?%>
100 100 <div id="article-source">
101 101 <%= _('Source: %s') % link_to(@page.source, @page.source) %>
102 102 </div>
... ...