diff options
Diffstat (limited to 'perllib')
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/UK.pm | 6 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/UKCouncils.pm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm index fde5f465a..18bf01476 100644 --- a/perllib/FixMyStreet/Cobrand/UK.pm +++ b/perllib/FixMyStreet/Cobrand/UK.pm @@ -107,7 +107,7 @@ sub short_name { return 'Durham+County' if $name eq 'Durham County Council'; return 'Durham+City' if $name eq 'Durham City Council'; - $name =~ s/^London Borough of //; + $name =~ s/^(Royal|London) Borough of //; $name =~ s/ (Borough|City|District|County) Council$//; $name =~ s/ Council$//; $name =~ s/ & / and /; @@ -140,8 +140,8 @@ sub find_closest { sub reports_body_check { my ( $self, $c, $code ) = @_; - # Deal with Bexley name not starting with short name - if ($code =~ /bexley/i) { + # Deal with Bexley and Greenwich name not starting with short name + if ($code =~ /bexley|greenwich/i) { my $body = $c->model('DB::Body')->search( { name => { -like => "%$code%" } } )->single; $c->stash->{body} = $body; return $body; diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm index 5f45609bb..81e5dd569 100644 --- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm +++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm @@ -171,8 +171,8 @@ sub all_reports_single_body { sub reports_body_check { my ( $self, $c, $code ) = @_; - # Deal with Bexley name not starting with short name - if ($code =~ /bexley/i) { + # Deal with Bexley/Greenwich name not starting with short name + if ($code =~ /bexley|greenwich/i) { my $body = $c->model('DB::Body')->search( { name => { -like => "%$code%" } } )->single; $c->stash->{body} = $body; return $body; |