Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
wpf
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
wpf
Commits
ee65ea49
Commit
ee65ea49
authored
10 months ago
by
József Dudás
Browse files
Options
Downloads
Patches
Plain Diff
Issue
#3456349
by Sutry, realityloop, davedg629: Error after upgrading Drupal 10.2.7 to 10.3.0
parent
87216382
Branches
Branches containing commit
Tags
1.2.0
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/Controller/ImageStyleDownloadController.php
+3
-3
3 additions, 3 deletions
src/Controller/ImageStyleDownloadController.php
src/Routing/RouteSubscriber.php
+4
-1
4 additions, 1 deletion
src/Routing/RouteSubscriber.php
wpf.info.yml
+1
-1
1 addition, 1 deletion
wpf.info.yml
with
8 additions
and
5 deletions
src/Controller/ImageStyleDownloadController.php
+
3
−
3
View file @
ee65ea49
...
...
@@ -83,11 +83,11 @@ class ImageStyleDownloadController extends CoreImageStyleDownloadController {
/**
* Builds the response.
*/
public
function
deliver
(
Request
$request
,
$scheme
,
ImageStyleInterface
$image_style
)
{
public
function
deliver
(
Request
$request
,
$scheme
,
ImageStyleInterface
$image_style
,
string
$required_derivative_scheme
)
{
// Interesting just the defined in JPEG_PATTERN extensions.
if
(
!
preg_match
(
ImageFactoryInterface
::
JPG_PATTERN
,
$request
->
getPathInfo
()))
{
// Don't match with extensions go to system image style delivery method.
return
parent
::
deliver
(
$request
,
$scheme
,
$image_style
);
return
parent
::
deliver
(
$request
,
$scheme
,
$image_style
,
$required_derivative_scheme
);
}
// Prepare image uri.
...
...
@@ -99,7 +99,7 @@ class ImageStyleDownloadController extends CoreImageStyleDownloadController {
$derivative_uri
=
$image_style
->
buildUri
(
$image_uri
);
if
(
!
preg_match
(
'/.webp$/'
,
$derivative_uri
))
{
// The image style is not converted to webp format go to system deliver.
return
parent
::
deliver
(
$request
,
$scheme
,
$image_style
);
return
parent
::
deliver
(
$request
,
$scheme
,
$image_style
,
$required_derivative_scheme
);
}
$headers
=
[];
...
...
This diff is collapsed.
Click to expand it.
src/Routing/RouteSubscriber.php
+
4
−
1
View file @
ee65ea49
...
...
@@ -16,7 +16,10 @@ class RouteSubscriber extends RouteSubscriberBase {
protected
function
alterRoutes
(
RouteCollection
$collection
):
void
{
foreach
([
'image.style_public'
,
'image.style_private'
]
as
$route_id
)
{
if
(
$route
=
$collection
->
get
(
$route_id
))
{
$route
->
setDefault
(
'_controller'
,
'Drupal\wpf\Controller\ImageStyleDownloadController::deliver'
);
$route
->
setDefault
(
'_controller'
,
'Drupal\wpf\Controller\ImageStyleDownloadController::deliver'
,
'required_derivative_scheme'
,
'public'
);
}
}
}
...
...
This diff is collapsed.
Click to expand it.
wpf.info.yml
+
1
−
1
View file @
ee65ea49
...
...
@@ -2,7 +2,7 @@ name: Webp fallback image
type
:
module
description
:
Prepare fallback image for webp using responsive image.
package
:
Image
core_version_requirement
:
^
8 || ^9 || ^
10
core_version_requirement
:
^10
.3
dependencies
:
-
drupal:file
-
drupal:responsive_image
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment