diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2012-05-28 16:07:57 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2012-05-28 16:07:57 +0100 |
| commit | 959012b397c40638eaa62cd911f416f605043330 (patch) | |
| tree | 6fcfd0325d02f89c12a83ceaea39966dfa3b454d /perllib/FixMyStreet/App.pm | |
| parent | c86fb4cfa6fdf62c5d0ba968b6fda7eb46c3d027 (diff) | |
| parent | 2e94d363be99e83a24ed7b14c6dd00480b9afc93 (diff) | |
Merge branch 'bromley'
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; } |