diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
| commit | 2e0a4e8ec45579e4e5c9cf8aa123d5ab215b9703 (patch) | |
| tree | c13e3c59b686e01460dc7960547f7e9c53c288bd /perllib/FixMyStreet/DB/Result/Problem.pm | |
| parent | b99c5ff97b29a27eeba52ed24385ac30388e875c (diff) | |
| parent | 88a7d38dffa3dabdf0f85573b254cea9c8ab232b (diff) | |
Merge remote-tracking branch 'origin/master' into fmb-read-only
Conflicts:
.gitignore
bin/make_css
conf/general.yml-example
perllib/FixMyStreet/App/Controller/Council.pm
perllib/FixMyStreet/App/Controller/Report/New.pm
perllib/FixMyStreet/Cobrand/Default.pm
templates/web/default/around/around_index.html
templates/web/default/index.html
templates/web/emptyhomes/index.html
templates/web/fixmystreet/around/around_index.html
templates/web/fixmystreet/index.html
web/fixmystreet_app_cgi.cgi
web/fixmystreet_app_fastcgi.cgi
Diffstat (limited to 'perllib/FixMyStreet/DB/Result/Problem.pm')
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/Problem.pm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index 4f35e7c94..c55ed3403 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -542,7 +542,6 @@ sub meta_line { } - $meta .= $c->cobrand->extra_problem_meta_text($problem); $meta .= '; ' . _('the map was not used so pin location may be inaccurate') unless $problem->used_map; @@ -555,9 +554,8 @@ sub body { if ($problem->external_body) { $body = $problem->external_body; } else { - (my $council = $problem->council) =~ s/\|.*//g; - my @councils = split( /,/, $council ); - my $areas_info = mySociety::MaPit::call('areas', \@councils); + my $councils = $problem->councils; + my $areas_info = mySociety::MaPit::call('areas', $councils); $body = join( _(' and '), map { my $name = $areas_info->{$_}->{name}; @@ -568,7 +566,7 @@ sub body { } else { $name; } - } @councils + } @$councils ); } return $body; |