Remove various UK specific code out of Default cobrand into UK one.

1 files changed, 5 insertions, 1 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Council.pm b/perllib/FixMyStreet/App/Controller/Council.pm
index 771603c22..b513ac930 100644
--- a/perllib/FixMyStreet/App/Controller/Council.pm
+++ b/perllib/FixMyStreet/App/Controller/Council.pm
@@ -23,7 +23,7 @@ there are no councils then return false.
 
 sub load_and_check_councils_and_wards : Private {
     my ( $self, $c ) = @_;
-    my @area_types = ( $c->cobrand->area_types(), @$mySociety::VotingArea::council_child_types );
+    my @area_types = ( $c->cobrand->area_types(), $c->cobrand->area_types_children() );
     $c->stash->{area_types} = \@area_types;
     $c->forward('load_and_check_councils');
 }
@@ -69,6 +69,10 @@ sub load_and_check_councils : Private {
           mySociety::MaPit::call( 'point', "4326/$short_longitude,$short_latitude",
             type => \@area_types );
     }
+    if ($all_councils->{error}) {
+        $c->stash->{location_error} = $all_councils->{error};
+        return;
+    }
 
     # Let cobrand do a check
     my ( $success, $error_msg ) =