diff options
Diffstat (limited to 'perllib/FixMyStreet/App/Controller')
-rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin.pm | 4 | ||||
-rw-r--r-- | perllib/FixMyStreet/App/Controller/Photo.pm | 4 | ||||
-rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/New.pm | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index f2d6040ae..c42916acb 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -1498,7 +1498,7 @@ sub rotate_photo : Private { return unless $direction eq _('Rotate Left') or $direction eq _('Rotate Right'); my $problem = $c->stash->{problem}; - my $fileid = $problem->get_photoset($c)->rotate_image( + my $fileid = $problem->get_photoset->rotate_image( $index, $direction eq _('Rotate Left') ? -90 : 90 ) or return; @@ -1529,7 +1529,7 @@ sub remove_photo : Private { if ($keys eq 'ALL') { $object->photo(undef); } else { - my $fileids = $object->get_photoset($c)->remove_images($keys); + my $fileids = $object->get_photoset->remove_images($keys); $object->photo($fileids); } return 1; diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm index f4866cc26..5a5771488 100644 --- a/perllib/FixMyStreet/App/Controller/Photo.pm +++ b/perllib/FixMyStreet/App/Controller/Photo.pm @@ -74,8 +74,8 @@ sub index :LocalRegex('^(c/)?(\d+)(?:\.(\d+))?(?:\.(full|tn|fp))?\.jpeg$') { my $photo; if ($item->can('get_photoset')) { - $photo = $item->get_photoset( $c ) - ->get_image_data( num => $photo_number, size => $size ) + $photo = $item->get_photoset + ->get_image_data( num => $photo_number, size => $size, default => $c->cobrand->default_photo_resize ) or $c->detach( 'no_photo' ); } else { $photo = $item->photo; diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 4632f450d..db524ada4 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -449,7 +449,7 @@ sub initialize_report : Private { $c->stash->{partial_token} = $token if $report; # Stash the photo IDs for "already got" display - $c->stash->{upload_fileid} = $report->get_photoset($c)->data; + $c->stash->{upload_fileid} = $report->get_photoset->data; } else { # no point keeping it if it is done. |