From 80590a33e14158b7e674455e9d4b1080a52f45f1 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 15 Mar 2013 17:38:41 +0000
Subject: Fix couple of issues with module upgrades.

---
 perllib/FixMyStreet/App.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index ee5b11876..3d7458e2a 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -2,6 +2,9 @@ package FixMyStreet::App;
 use Moose;
 use namespace::autoclean;
 
+# Should move away from Email::Send, but until then:
+$Return::Value::NO_CLUCK = 1;
+
 use Catalyst::Runtime 5.80;
 use DateTime;
 use FixMyStreet;
@@ -46,7 +49,7 @@ __PACKAGE__->config(
     default_view => 'Web',
 
     # Serve anything in web dir that is not a .cgi script
-    static => {    #
+    'Plugin::Static::Simple' => {
         include_path      => [ FixMyStreet->path_to("web") . "" ],
         ignore_extensions => ['cgi'],
     },
-- 
cgit v1.2.3