This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/vendor/magento/module-customer/Model/ForgotPasswordToken/GetCustomerByToken.php b/vendor/magento/module-customer/Model/ForgotPasswordToken/GetCustomerByToken.php | |
| index e91bab987e906787095eca90c073d749974b2fb9..6b2cb8d56812adc0fdd5df43220bc1292192357d 100644 | |
| --- a/vendor/magento/module-customer/Model/ForgotPasswordToken/GetCustomerByToken.php | |
| +++ b/vendor/magento/module-customer/Model/ForgotPasswordToken/GetCustomerByToken.php | |
| @@ -85,6 +85,7 @@ | |
| ); | |
| } | |
| - return $collection->getFirstItem(); | |
| + // Resource collections return models; the service contract requires customer data. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/vendor/magento/framework/Escaper.php b/vendor/magento/framework/Escaper.php | |
| index e873a9a8a933d4af626f708e662eab360ada3c55..3c5db9396877695d6736a7827e0a2c176ab0ba1e 100644 | |
| --- a/vendor/magento/framework/Escaper.php | |
| +++ b/vendor/magento/framework/Escaper.php | |
| @@ -387,8 +387,9 @@ class Escaper | |
| */ | |
| public function escapeXssInUrl($data) | |
| { | |
| - $data = $this->decodeHtmlEntitiesToFixedPoint((string)$data); | |
| + $data = (string)$data; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From 063359089809f7da4a4f6a95b4523135e6c4711f Mon Sep 17 00:00:00 2001 | |
| From: Luke Rodgers <lr@amp.co> | |
| Date: Thu, 9 Jun 2022 11:58:46 +0100 | |
| Subject: [PATCH 1/4] Fix Test Logger monolog compatability | |
| # System info | |
| - Magento 2.4.4 | |
| - PHP 8.1 | |
| # To reproduce |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- App/DeploymentConfig.php 2022-03-08 00:52:02.000000000 +0000 | |
| +++ App/DeploymentConfig.php 2022-06-20 19:45:21.192956000 +0000 | |
| @@ -35,14 +35,14 @@ | |
| * | |
| * @var array | |
| */ | |
| - private $data; | |
| + private $data = []; | |
| /** |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Reading table information for completion of table and column names | |
| You can turn off this feature to get a quicker startup with -A | |
| Welcome to the MariaDB monitor. Commands end with ; or \g. | |
| Your MariaDB connection id is 1898052 | |
| Server version: 10.2.31-MariaDB MariaDB Server | |
| Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others. | |
| Type 'help;' or '\h' for help. Type '\c' to clear the current input statement. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Reading table information for completion of table and column names | |
| You can turn off this feature to get a quicker startup with -A | |
| Welcome to the MariaDB monitor. Commands end with ; or \g. | |
| Your MySQL connection id is 209 | |
| Server version: 5.7.33-36 Percona Server (GPL), Release 36, Revision 7e403c5 | |
| Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others. | |
| Type 'help;' or '\h' for help. Type '\c' to clear the current input statement. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From 597b769f5918e11b58dc15ae7cc407477ee2c695 Mon Sep 17 00:00:00 2001 | |
| From: Sergey Nezbritskiy <sergey.nezbritskiy@gmail.com> | |
| Date: Sun, 15 Aug 2021 17:55:34 +0300 | |
| Subject: [PATCH 1/7] ISSUE-33802: ensure that deployment config will reload | |
| its data, if the key was not found | |
| --- | |
| .../Framework/App/DeploymentConfig.php | 33 +++++++--- | |
| .../App/Test/Unit/DeploymentConfigTest.php | 64 +++++++++++-------- | |
| 2 files changed, 60 insertions(+), 37 deletions(-) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| /** | |
| * DevGenii #8: Dummy Postpay JavaScript | |
| */ | |
| define(function () { | |
| window.Postpay = { | |
| renderElement: function (el) { | |
| el.innerHTML = 'Postpay!' | |
| }, | |
| hideElement: function (el) { | |
| el.style.display = 'none'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| marko@marko-work ~/Desktop/magento $ grep -A 10 'function getVersionInfo' < app/Mage.php | |
| public static function getVersionInfo() | |
| { | |
| return array( | |
| 'major' => '1', | |
| 'minor' => '9', | |
| 'revision' => '3', | |
| 'patch' => '8', | |
| 'stability' => '', | |
| 'number' => '', |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| INSERT INTO `catalog_product_index_price_bundle_idx` | |
| SELECT `e`.`entity_id`, | |
| `cg`.`customer_group_id`, | |
| `cw`.`website_id`, | |
| IF(IF(Ifnull(tas_tax_class_id.value_id, -1) > 0, tas_tax_class_id.value, tad_tax_class_id.value) IS NOT NULL, IF(Ifnull(tas_tax_class_id.value_id, -1) > 0, tas_tax_class_id.value, tad_tax_class_id.value), 0) AS `tax_class_id`, | |
| 1 AS `price_type`, | |
| IF(IF(IF(Ifnull(tas_special_from_date.value_id, -1) > 0, tas_special_from_date.value, tad_special_from_date.value) IS NULL, 1, IF(IF(Ifnull(tas_special_from_date.value_id, -1) > 0, tas_special_from_date.value, tad_special_from_date.value) <= cwd.website_date, 1, 0)) > 0 | |
| AND IF(IF(Ifnull(tas_special_to_date.value_id, -1) > 0, tas_special_to_date.value, tad_special_to_date.value) IS NUL |
NewerOlder