Merge branch 'master' into barnet-integration

(prior to go-live... amongst other things, the Barnet web templates had changed.
NB conflict with carton.lock, accepted master in full)

Conflicts:
	carton.lock

1 files changed, 9 insertions, 2 deletions

diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm
index 60e9dd09f..3de83b265 100644
--- a/perllib/FixMyStreet/App/Controller/My.pm
+++ b/perllib/FixMyStreet/App/Controller/My.pm
@@ -30,9 +30,16 @@ sub my : Path : Args(0) {
 
     my $pins = [];
     my $problems = {};
-    my $rs = $c->user->problems->search( {
+
+    my $params = {
         state => [ FixMyStreet::DB::Result::Problem->visible_states() ],
-    }, {
+    };
+    $params = {
+        %{ $c->cobrand->problems_clause },
+        %$params
+    } if $c->cobrand->problems_clause;
+
+    my $rs = $c->user->problems->search( $params, {
         order_by => { -desc => 'confirmed' },
         rows => 50
     } )->page( $p_page );