4 files changed, 7 insertions, 12 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 8b606ea85..3bf40b8f9 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -25,8 +25,7 @@ class AdminController < ApplicationController
     def expire_for_request(info_request)
         # Clear out cached entries, by removing files from disk (the built in
         # Rails fragment cache made doing this and other things too hard)
-        cache_subpath = foi_fragment_cache_all_for_request(info_request)
-        FileUtils.rm_rf(cache_subpath)
+        info_request.foi_fragment_cache_directories.each{ |dir| FileUtils.rm_rf(dir) }
 
         # Remove any download zips
         FileUtils.rm_rf(info_request.download_zip_dir)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0c5f5bd02..4d3f40d40 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -189,14 +189,6 @@ class ApplicationController < ActionController::Base
         return File.join(File.split(path).map{|x| x[0...max_file_length]})
     end
 
-    def foi_fragment_cache_all_for_request(info_request)
-        # return stub path so admin can expire it
-        first_three_digits = info_request.id.to_s()[0..2]
-        path = "views/request/#{first_three_digits}/#{info_request.id}"
-        foi_cache_path = File.expand_path(File.join(File.dirname(__FILE__), '../../cache'))
-        return File.join(foi_cache_path, path)
-    end
-
     def foi_fragment_cache_exists?(key_path)
         return File.exists?(key_path)
     end
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 158492eb2..2c8abbaf4 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -32,7 +32,7 @@ class GeneralController < ApplicationController
             if !content.empty?
                 @data = XmlSimple.xml_in(content)
                 @channel = @data['channel'][0]
-                @blog_items = @channel['item']
+                @blog_items = @channel.fetch('item') { [] }
                 @feed_autodetect = [{:url => @feed_url, :title => "#{site_name} blog"}]
             end
         end
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index fcc500e06..f23343ddb 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -199,7 +199,7 @@ class UserController < ApplicationController
         work_out_post_redirect
         @request_from_foreign_country = country_from_ip != AlaveteliConfiguration::iso_country_code
         # Make the user and try to save it
-        @user_signup = User.new(params[:user_signup])
+        @user_signup = User.new(user_params(:user_signup))
         error = false
         if @request_from_foreign_country && !verify_recaptcha
             flash.now[:error] = _("There was an error with the words you entered, please try again.")
@@ -601,6 +601,10 @@ class UserController < ApplicationController
 
     private
 
+    def user_params(key = :user)
+        params[key].slice(:name, :email, :password, :password_confirmation)
+    end
+
     def is_modal_dialog
         (params[:modal].to_i != 0)
     end