Merge branch 'master' into fmb-read-only

Conflicts:
	.gitignore
	bin/make_css
	perllib/FixMyStreet/Cobrand/FixMyStreet.pm

1 files changed, 4 insertions, 8 deletions

diff --git a/perllib/Open311/GetServiceRequestUpdates.pm b/perllib/Open311/GetServiceRequestUpdates.pm
index b5577ff6c..c30d05b22 100644
--- a/perllib/Open311/GetServiceRequestUpdates.pm
+++ b/perllib/Open311/GetServiceRequestUpdates.pm
@@ -98,19 +98,15 @@ sub update_comments {
                 if ( $comment->created_local > $p->lastupdate_local ) {
                     if ( $p->is_open and lc($request->{status}) eq 'closed' ) {
                         $p->state( 'fixed - council' );
-                        $p->lastupdate( $comment->created );
-                        $p->update;
-
-                        $comment->mark_fixed( 1 );
+                        $comment->problem_state( 'fixed - council' );
                     } elsif ( ( $p->is_closed || $p->is_fixed ) and lc($request->{status}) eq 'open' ) {
                         $p->state( 'confirmed' );
-                        $p->lastupdate( $comment->created );
-                        $p->update;
-
-                        $comment->mark_open( 1 );
+                        $comment->problem_state( 'confirmed' );
                     }
                 }
 
+                $p->lastupdate( $comment->created );
+                $p->update;
                 $comment->insert();
 
                 if ( $self->suppress_alerts ) {