diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-05-25 18:07:20 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-05-25 18:07:20 +0100 |
| commit | 6b26b7ec133eb9bdd4a9bed45477ec6d9d78304c (patch) | |
| tree | 24cc24b1536ea4bdd6fa717a5a268d85ddad3325 /perllib/FixMyStreet/App.pm | |
| parent | 0ff2c1689fafab7ed533b3989075c34f3c1a8779 (diff) | |
| parent | 5ab9f3916e43372a89dd78740b752de2c7cf2552 (diff) | |
Merge remote-tracking branch 'origin/bromley' into bromley
Diffstat (limited to 'perllib/FixMyStreet/App.pm')
| -rw-r--r-- | perllib/FixMyStreet/App.pm | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 1624f89e7..3d9f0a511 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -181,12 +181,7 @@ sub setup_request { Memcached::set_namespace( FixMyStreet->config('FMS_DB_NAME') . ":" ); - my $map = $host =~ /^osm\./ ? 'OSM' : $c->req->param('map_override'); - #if ($c->sessionid) { - # $map = $c->session->{map}; - # $map = undef unless $map eq 'OSM'; - #} - FixMyStreet::Map::set_map_class( $map ); + FixMyStreet::Map::set_map_class( $cobrand->map_type || $c->req->param('map_override') ); return $c; } |