diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-07-26 16:57:08 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-07-26 16:57:08 +0100 |
| commit | 54066cd1387643dd6c6cb3040c520bee66881fd7 (patch) | |
| tree | eda84b3f347220ed12de3aa690116148287891bd /perllib/FixMyStreet/App.pm | |
| parent | 8146bad18eeaab658871dd28eb38199a5d068395 (diff) | |
| parent | 198fcef62892fe0b2fbb3ea8a080fca87843445e (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/App/Controller/JSON.pm
perllib/FixMyStreet/Map/Tilma/Original.pm
web/css/core.css
Diffstat (limited to 'perllib/FixMyStreet/App.pm')
| -rw-r--r-- | perllib/FixMyStreet/App.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 90f1f24bc..68bfc728b 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -180,7 +180,11 @@ sub setup_request { Memcached::set_namespace( FixMyStreet->config('BCI_DB_NAME') . ":" ); - my $map = $host =~ /^osm\./ ? 'OSM' : $c->req->param('map'); + 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 ); return $c; |