diff options
| author | Dave Whiteland <dave@mysociety.org> | 2012-05-29 15:57:41 +0100 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2012-05-29 15:57:41 +0100 |
| commit | 67da8efc720d2d0bd22bd9fe8655b7e983b35bb4 (patch) | |
| tree | 38b8570647124df06c637d4b923f6010211ef328 /perllib/FixMyStreet/App.pm | |
| parent | 40b3a51d33caefa8f5fb97ce9be18ef936c7e260 (diff) | |
| parent | 131ff6e9bf3626d6a8fff6ae54669d250148a63a (diff) | |
Merge remote branch 'origin/master' into fmb-read-only
Conflicts:
bin/send-reports
perllib/FixMyStreet/Cobrand/Default.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
templates/web/fixmystreet/alert/index.html
templates/web/fixmystreet/around/display_location.html
web/cobrands/fixmystreet/_layout.scss
web/js/map-OpenLayers.js
Diffstat (limited to 'perllib/FixMyStreet/App.pm')
| -rw-r--r-- | perllib/FixMyStreet/App.pm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 262379b79..3d9f0a511 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -53,6 +53,7 @@ __PACKAGE__->config( 'Plugin::Session' => { # Catalyst::Plugin::Session::Store::DBIC dbic_class => 'DB::Session', expires => 3600 * 24 * 7 * 4, # 4 weeks + cookie_secure => 2, }, 'Plugin::Authentication' => { @@ -180,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; } |