4 files changed, 11 insertions, 14 deletions
diff --git a/perllib/FixMyStreet/Cobrand/FiksGataMi.pm b/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
index ba26b7a2c..242735073 100644
--- a/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
+++ b/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
@@ -29,6 +29,8 @@ sub disambiguate_location {
 }
 
 sub area_types {
+    my $self = shift;
+    return $self->next::method() if FixMyStreet->config('STAGING_SITE') && FixMyStreet->config('SKIP_CHECKS_ON_STAGING');
     [ 'NKO', 'NFY', 'NRA' ];
 }
 
diff --git a/perllib/FixMyStreet/Cobrand/FixaMinGata.pm b/perllib/FixMyStreet/Cobrand/FixaMinGata.pm
index 9ffbf00b8..a321d5c7c 100644
--- a/perllib/FixMyStreet/Cobrand/FixaMinGata.pm
+++ b/perllib/FixMyStreet/Cobrand/FixaMinGata.pm
@@ -30,6 +30,8 @@ sub disambiguate_location {
 }
 
 sub area_types {
+    my $self = shift;
+    return $self->next::method() if FixMyStreet->config('STAGING_SITE') && FixMyStreet->config('SKIP_CHECKS_ON_STAGING');
     [ 'KOM' ];
 }
 
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index 5d72c4962..42c9c5cbc 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -42,11 +42,13 @@ sub restriction {
 
 sub problems_restriction {
     my ($self, $rs) = @_;
+    return $rs if FixMyStreet->config('STAGING_SITE') && FixMyStreet->config('SKIP_CHECKS_ON_STAGING');
     return $rs->to_body($self->council_id);
 }
 
 sub updates_restriction {
     my ($self, $rs) = @_;
+    return $rs if FixMyStreet->config('STAGING_SITE') && FixMyStreet->config('SKIP_CHECKS_ON_STAGING');
     return $rs->to_body($self->council_id);
 }
 
@@ -96,6 +98,8 @@ sub enter_postcode_text {
 sub area_check {
     my ( $self, $params, $context ) = @_;
 
+    return 1 if FixMyStreet->config('STAGING_SITE') && FixMyStreet->config('SKIP_CHECKS_ON_STAGING');
+
     my $councils = $params->{all_areas};
     my $council_match = defined $councils->{$self->council_id};
     if ($council_match) {
diff --git a/perllib/Utils.pm b/perllib/Utils.pm
index 87c1a10d6..84c09d09d 100644
--- a/perllib/Utils.pm
+++ b/perllib/Utils.pm
@@ -15,6 +15,7 @@ use Encode;
 use File::Slurp qw();
 use mySociety::GeoUtil;
 use mySociety::Locale;
+use FixMyStreet;
 
 =head2 convert_latlon_to_en
 
@@ -199,7 +200,7 @@ sub prettify_duration {
         $s = int(($s+60*60*12)/60/60/24)*60*60*24;
     } elsif ($nearest eq 'hour') {
         $s = int(($s+60*30)/60/60)*60*60;
-    } elsif ($nearest eq 'minute') {
+    } else { # minute
         $s = int(($s+30)/60)*60;
         return _('less than a minute') if $s == 0;
     }
@@ -221,7 +222,7 @@ sub _part {
             $str = mySociety::Locale::nget("%d day", "%d days", $i);
         } elsif ($m == 60*60) {
             $str = mySociety::Locale::nget("%d hour", "%d hours", $i);
-        } elsif ($m == 60) {
+        } else {
             $str = mySociety::Locale::nget("%d minute", "%d minutes", $i);
         }
         push @$o, sprintf($str, $i);
@@ -229,17 +230,5 @@ sub _part {
     }
 }
 
-=head2 read_file
-
-Reads in a UTF-8 encoded file using File::Slurp and decodes it from UTF-8.
-This appears simplest, rather than getting confused with binmodes and so on.
-
-=cut
-sub read_file {
-    my $filename = shift;
-    my $data = File::Slurp::read_file( $filename );
-    $data = Encode::decode( 'utf8', $data );
-    return $data;
-}
 
 1;