Commit 162f3cba authored by Istvan Csaki's avatar Istvan Csaki
Browse files

Sync TinyPngImageStyleDownloadController with core ImageStyleDownloadController

parent 5187a00a

src/Controller/TinyPngImageStyleDownloadController.php

+9 −9
Changes for src/Controller/TinyPngImageStyleDownloadController.php: 9 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -156,15 +156,15 @@ class TinyPngImageStyleDownloadController extends ImageStyleDownloadController { 
      throw new AccessDeniedHttpException("The scheme for this image doesn't match the scheme for the original image");

    }



    if ($token_is_valid) {

      $is_public = ($scheme !== 'private');

    }

    else {

      $core_schemes = ['public', 'private', 'temporary'];

      $additional_public_schemes = array_diff(Settings::get('file_additional_public_schemes', []), $core_schemes);

      $public_schemes = array_merge(['public'], $additional_public_schemes);

      $is_public = in_array($derivative_scheme, $public_schemes, TRUE);

    }

    $additional_public_schemes = array_diff(

      Settings::get('file_additional_public_schemes', []),

      ['public', 'private', 'temporary'],

    );

    $is_public = in_array(

      $derivative_scheme,

      array_merge(['public'], $additional_public_schemes),

      TRUE,

    );



    $headers = [];