Skip to content

Commit 1e29a6c

Browse files
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #22378: [Backport] Same product quantity not increment when added with guest user. #21375 (by @amol2jcommerce) - #22464: [Backport] Remove all marketing get params on Varnish to minimize the cache objects (added facebook and bronto parameter) (by @ihor-sviziev) - #22415: filter config values on testSuiteStart (by @bcerban) Fixed GitHub Issues: - #21375: Same product quantity not increment when added with guest user. (reported by @krishprakash) has been fixed in #22378 by @amol2jcommerce in 2.2-develop branch Related commits: 1. 57af527 - #22370: Filtering ignored config values in test framework causes error (reported by @bcerban) has been fixed in #22415 by @bcerban in 2.2-develop branch Related commits: 1. 79e90ba
2 parents c1aa3b2 + 0220d6d commit 1e29a6c

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

app/code/Magento/PageCache/etc/varnish4.vcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ sub vcl_recv {
9292
}
9393

9494
# Remove all marketing get parameters to minimize the cache objects
95-
if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=") {
96-
set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
95+
if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=") {
96+
set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
9797
set req.url = regsub(req.url, "[?|&]+$", "");
9898
}
9999

app/code/Magento/PageCache/etc/varnish5.vcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ sub vcl_recv {
9393
}
9494

9595
# Remove all marketing get parameters to minimize the cache objects
96-
if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=") {
97-
set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
96+
if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=") {
97+
set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
9898
set req.url = regsub(req.url, "[?|&]+$", "");
9999
}
100100

app/code/Magento/Quote/Model/Quote/Item/Compare.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected function getOptionValues($value)
5050
if (is_string($value) && $this->jsonValidator->isValid($value)) {
5151
$value = $this->serializer->unserialize($value);
5252
if (is_array($value)) {
53-
unset($value['qty'], $value['uenc']);
53+
unset($value['qty'], $value['uenc'], $value['related_product'], $value['item']);
5454
$value = array_filter($value, function ($optionValue) {
5555
return !empty($optionValue);
5656
});

dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function startTestSuite()
5151
{
5252
if (null === $this->reader) {
5353
$this->reader = Bootstrap::getObjectManager()->get(\Magento\Framework\App\DeploymentConfig\Reader::class);
54-
$this->config = $this->reader->load();
54+
$this->config = $this->filterIgnoredConfigValues($this->reader->load());
5555
}
5656
}
5757

0 commit comments

Comments
 (0)