Remove unnecessary rescues.

senior · Jun 18, 2011 · 65ae050 · 65ae050
1 parent 1336136
commit 65ae050
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/core/lib/refinery/application_controller.rb b/core/lib/refinery/application_controller.rb
@@ -31,7 +31,7 @@ def self.included(c) # Extend controller
                                :show_welcome_page?
 
         c.send :after_filter, :store_current_location!,
-                              :if => Proc.new {|c| c.send(:refinery_user?) rescue false }
+                              :if => Proc.new {|c| c.send(:refinery_user?) }
 
         if Refinery.rescue_not_found
           c.send :rescue_from, ActiveRecord::RecordNotFound,

diff --git a/core/lib/refinery/helpers/meta_helper.rb b/core/lib/refinery/helpers/meta_helper.rb
@@ -40,7 +40,11 @@ def page_title(options = {})
               when "text"
                 obj.custom_title
               when "image"
-                image_fu(obj.custom_title_image, nil, {:alt => obj.title}) rescue obj.title
+                if obj.custom_title_image.present?
+                  image_fu(obj.custom_title_image, nil, {:alt => obj.title})
+                else
+                  obj.title
+                end
               else
                 obj.title
               end

diff --git a/dashboard/app/views/refinery/admin/dashboard/_recent_activity.html.erb b/dashboard/app/views/refinery/admin/dashboard/_recent_activity.html.erb
@@ -1,6 +1,6 @@
 <div id='recent_activity'>
   <h2><%= t('.latest_activity') %></h2>
-  <% if (activity = @recent_activity.collect{|a| activity_message_for(a) rescue ''}.reject(&:blank?)).present? %>
+  <% if (activity = @recent_activity.collect{|a| activity_message_for(a)}.reject(&:blank?)).present? %>
     <ul class='clickable'>
     <% activity.each do |message| %>
        <li class='<%= cycle("on", "on-hover", :name => 'recent_activity_cycle') %>'>