Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/acts_as_xapian/tasks/xapian.rake b/lib/acts_as_xapian/tasks/xapian.rake
index c1986ce1e..52d94011a 100644
--- a/lib/acts_as_xapian/tasks/xapian.rake
+++ b/lib/acts_as_xapian/tasks/xapian.rake
@@ -9,7 +9,7 @@ namespace :xapian do
     # "verbose=true" to print model name as it is run.
     desc 'Updates Xapian search index with changes to models since last call'
     task :update_index => :environment do
-        ActsAsXapian.update_index(ENV['flush'] ? true : false, ENV['verbose'] ? true : false)
+        ActsAsXapian.update_index(ENV['flush'], ENV['verbose'])
     end
 
     # Parameters - specify 'models="PublicBody User"' to say which models
diff --git a/lib/attachment_to_html/adapter.rb b/lib/attachment_to_html/adapter.rb
index d8b9f41f7..058fb2a01 100644
--- a/lib/attachment_to_html/adapter.rb
+++ b/lib/attachment_to_html/adapter.rb
@@ -41,7 +41,7 @@ module AttachmentToHTML
     end
 
     def contains_images?
-      !!body.match(/<img[^>]*>/mi)
+      body.match(/<img[^>]*>/mi)
     end
 
     def create_tempfile(text)