joomla
/
cms
mirror of https://github.com/joomla/joomla-cms.git
29
0
Fork 0
Code Packages Releases Activity

[4.4] Fix System - Page Cache plugin ignore Exclude URLs parameter (#42871) 

* Fix System - Page Cache plugin ignore Exclude URLs parameter

* phpcs

---------
This commit is contained in:
Tuan Pham Ngoc 2024-03-04 20:00:58 +07:00 committed by GitHub
parent 6023e5cee7
commit 76f6773a9c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/system/cache/src/Extension/Cache.php vendored
View File

@ -321,6 +321,7 @@ final class Cache extends CMSPlugin implements SubscriberInterface
// Convert the exclusions into a normalised array
$exclusions = str_replace(["\r\n", "\r"], "\n", $exclusions);
$exclusions = explode("\n", $exclusions);
$exclusions = array_map('trim', $exclusions);
$filterExpression = function ($x) {
return $x !== '';
};
@ -331,19 +332,14 @@ final class Cache extends CMSPlugin implements SubscriberInterface
. Uri::getInstance()->buildQuery($this->router->getVars());
$externalUrl = Uri::getInstance()->toString();
$reduceCallback
= function (bool $carry, string $exclusion) use ($internalUrl, $externalUrl) {
// Test both external and internal URIs
return $carry && preg_match(
'#' . $exclusion . '#i',
$externalUrl . ' ' . $internalUrl,
$match
);
};
$excluded = array_reduce($exclusions, $reduceCallback, false);
if ($excluded) {
return true;
// Loop through each pattern.
if ($exclusions) {
foreach ($exclusions as $exclusion) {
// Test both external and internal URI
if (preg_match('#' . $exclusion . '#i', $externalUrl . ' ' . $internalUrl, $match)) {
return true;
}
}
}
}