From 949339eb7f5f8392c6c448d31ba59baec1c2c2e5 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Wed, 2 Dec 2009 09:35:45 -0300
Subject: [PATCH] s/and/&&/

---
 app/views/content_viewer/view_page.rhtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/content_viewer/view_page.rhtml b/app/views/content_viewer/view_page.rhtml
index c07f945..db82678 100644
--- a/app/views/content_viewer/view_page.rhtml
+++ b/app/views/content_viewer/view_page.rhtml
@@ -2,7 +2,7 @@
 
 <%
   # AddThis Button
-  if block_given? and web2_conf['addthis']
+  if block_given? && web2_conf['addthis']
       opts = web2_conf['addthis']
 %>
 <div id="addThis">
@@ -76,7 +76,7 @@
 </div>
 <% end %>
 
-<% if profile.enterprise? and !profile.enabled? and !profile.blocks.select {|b| b.class == DisabledEnterpriseMessageBlock}.any? %>
+<% if profile.enterprise? && !profile.enabled? && !profile.blocks.select {|b| b.class == DisabledEnterpriseMessageBlock}.any? %>
   <div id='profile-disabled'>
     <%= environment.message_for_disabled_enterprise %>
   </div>
@@ -96,7 +96,7 @@
 </div>
 <% end %>
 
-<% if ! @page.source.nil? and ! @page.source.empty?%>
+<% if ! @page.source.nil? && ! @page.source.empty?%>
 <div id="article-source">
   <%= _('Source: %s') % link_to(@page.source, @page.source) %>
 </div>
--
libgit2 0.21.2