diff options
Diffstat (limited to 'perllib/FixMyStreet/DB/Result')
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/Comment.pm | 11 | ||||
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/User.pm | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm index 562f29693..409a6e1ab 100644 --- a/perllib/FixMyStreet/DB/Result/Comment.pm +++ b/perllib/FixMyStreet/DB/Result/Comment.pm @@ -274,14 +274,9 @@ sub problem_state_display { return FixMyStreet::DB->resultset("State")->display('confirmed', 1); } elsif ($self->problem_state) { my $state = $self->problem_state; - if ($state eq 'not responsible') { - $update_state = _( "not the council's responsibility" ); - if ($cobrand eq 'bromley' || $self->problem->to_body_named('Bromley')) { - $update_state = 'third party responsibility'; - } - } else { - $update_state = FixMyStreet::DB->resultset("State")->display($state, 1); - } + my $cobrand_name = $cobrand; + $cobrand_name = 'bromley' if $self->problem->to_body_named('Bromley'); + $update_state = FixMyStreet::DB->resultset("State")->display($state, 1, $cobrand_name); } return $update_state; diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm index 296cf997d..d02039ac3 100644 --- a/perllib/FixMyStreet/DB/Result/User.pm +++ b/perllib/FixMyStreet/DB/Result/User.pm @@ -196,7 +196,7 @@ sub check_for_errors { my $parsed = FixMyStreet::SMS->parse_username($self->phone); if (!$parsed->{phone}) { $errors{username} = _('Please check your phone number is correct'); - } elsif (!$parsed->{phone}->is_mobile) { + } elsif (!$parsed->{may_be_mobile}) { $errors{username} = _('Please enter a mobile number'); } } |