-
Notifications
You must be signed in to change notification settings - Fork 61
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Release 1.0.13
- Loading branch information
Oleksandr Rykh
authored
Dec 9, 2020
1 parent
1d2d8c1
commit ff67581
Showing
21 changed files
with
3,736 additions
and
2 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
25 changes: 25 additions & 0 deletions
25
...ue_where_analytics_collect_data_is_throwing_an_error_due_to_NULL_description__2.3.1.patch
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| diff --git a/vendor/magento/module-page-builder-analytics/Model/ContentTypeUsageReportProvider.php b/vendor/magento/module-page-builder-analytics/Model/ContentTypeUsageReportProvider.php | ||
| index bbd8b6340..0a7112e05 100644 | ||
| --- a/vendor/magento/module-page-builder-analytics/Model/ContentTypeUsageReportProvider.php | ||
| +++ b/vendor/magento/module-page-builder-analytics/Model/ContentTypeUsageReportProvider.php | ||
| @@ -99,12 +99,14 @@ class ContentTypeUsageReportProvider | ||
| $query->getSelect()->limit($this->batchSize, $batch * $this->batchSize) | ||
| ); | ||
| foreach ($batchQuery->fetchAll() as $row) { | ||
| - foreach ($contentTypes as $type) { | ||
| - // Count the amount of content types within the content | ||
| - $typeCounts[$type['name']] += substr_count( | ||
| - $row['content'], | ||
| - 'data-content-type="' . $type['name'] . '"' | ||
| - ); | ||
| + if (is_string($row['content'])) { | ||
| + foreach ($contentTypes as $type) { | ||
| + // Count the amount of content types within the content | ||
| + $typeCounts[$type['name']] += substr_count( | ||
| + $row['content'], | ||
| + 'data-content-type="' . $type['name'] . '"' | ||
| + ); | ||
| + } | ||
| } | ||
| } | ||
| } |
51 changes: 51 additions & 0 deletions
51
patches/commerce/MDVA-23764__fixes_the_bug_in_JsFooterPlugin__2.3.3.patch
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| diff --git a/vendor/magento/module-banner/Controller/Ajax/Load.php b/vendor/magento/module-banner/Controller/Ajax/Load.php | ||
| index bb88e6164ae..01e8c71a23f 100644 | ||
| --- a/vendor/magento/module-banner/Controller/Ajax/Load.php | ||
| +++ b/vendor/magento/module-banner/Controller/Ajax/Load.php | ||
| @@ -5,12 +5,14 @@ | ||
| */ | ||
| namespace Magento\Banner\Controller\Ajax; | ||
|
|
||
| -use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; | ||
| use Magento\Backend\App\Action\Context; | ||
| use Magento\Banner\Model\Banner\DataFactory; | ||
| use Magento\Framework\App\Action\Action; | ||
| +use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface; | ||
| use Magento\Framework\Controller\Result\JsonFactory; | ||
| use Magento\Framework\Controller\Result\RawFactory; | ||
| +use Zend\Http\AbstractMessage; | ||
| +use Zend\Http\Response; | ||
|
|
||
| /** | ||
| * Banner loading | ||
| @@ -51,20 +53,22 @@ class Load extends Action implements HttpGetActionInterface | ||
| } | ||
|
|
||
| /** | ||
| - * {@inheritdoc} | ||
| + * @inheritdoc | ||
| */ | ||
| public function execute() | ||
| { | ||
| - $resultRaw = $this->rawFactory->create(); | ||
| $dataObject = $this->dataFactory->create(); | ||
| - | ||
| + $resultJson = $this->jsonFactory->create(); | ||
| if (!$this->getRequest()->isXmlHttpRequest()) { | ||
| - return $resultRaw->setHttpResponseCode(400); | ||
| + $resultJson->setStatusHeader( | ||
| + Response::STATUS_CODE_400, | ||
| + AbstractMessage::VERSION_11, | ||
| + 'Invalid Request' | ||
| + ); | ||
| + $response = ['message' => __('Invalid Request')]; | ||
| + } else { | ||
| + $response = ['data' => $dataObject->getSectionData()]; | ||
| } | ||
| - | ||
| - $response = ['data' => $dataObject->getSectionData()]; | ||
| - $resultJson = $this->jsonFactory->create(); | ||
| - | ||
| return $resultJson->setData($response); | ||
| } | ||
| } |
79 changes: 79 additions & 0 deletions
79
...the_issue_where_the_rescheduled_product_changes_are_erased_after_the_cron__2.3.5-p2.patch
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| diff --git a/vendor/magento/module-staging/Model/ResourceModel/Update.php b/vendor/magento/module-staging/Model/ResourceModel/Update.php | ||
| index 03baeb38c50..3e6b66b57e7 100644 | ||
| --- a/vendor/magento/module-staging/Model/ResourceModel/Update.php | ||
| +++ b/vendor/magento/module-staging/Model/ResourceModel/Update.php | ||
| @@ -117,6 +117,7 @@ class Update extends AbstractDb | ||
|
|
||
| /** | ||
| * Check for update entities associated with rollback_id. | ||
| + * | ||
| * Receives optional parameter $ignoredUpdates with array of update ids which will be filtered in request. | ||
| * | ||
| * @param int $rollbackId | ||
| @@ -151,7 +152,7 @@ class Update extends AbstractDb | ||
| $bind, | ||
| ['id = ?' => $object->getOldId()] | ||
| ); | ||
| - } else { | ||
| + } elseif (!$object->getOldOriginId()) { | ||
| foreach ($this->stagingList->getEntityTypes() as $entityType) { | ||
| $metadata = $this->metadataPool->getMetadata($entityType); | ||
| $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName()); | ||
| diff --git a/vendor/magento/module-staging/Model/UpdateRepository.php b/vendor/magento/module-staging/Model/UpdateRepository.php | ||
| index 1c338981f92..b78a78f6a29 100644 | ||
| --- a/vendor/magento/module-staging/Model/UpdateRepository.php | ||
| +++ b/vendor/magento/module-staging/Model/UpdateRepository.php | ||
| @@ -16,10 +16,9 @@ use Magento\Framework\Exception\ValidatorException; | ||
| use Magento\Staging\Model\ResourceModel\Update as UpdateResource; | ||
| use Magento\Staging\Api\Data\UpdateInterface; | ||
| use Magento\Staging\Model\Update\Validator; | ||
| -use Magento\Staging\Model\VersionHistoryInterface; | ||
|
|
||
| /** | ||
| - * Class UpdateRepository | ||
| + * Represents UpdateRepository class | ||
| * @SuppressWarnings(PHPMD.CouplingBetweenObjects) | ||
| */ | ||
| class UpdateRepository implements UpdateRepositoryInterface | ||
| @@ -65,7 +64,7 @@ class UpdateRepository implements UpdateRepositoryInterface | ||
| * @param UpdateResource $resource | ||
| * @param UpdateFactory $updateFactory | ||
| * @param Validator $validator | ||
| - * @param \Magento\Staging\Model\VersionHistoryInterface $versionHistory | ||
| + * @param VersionHistoryInterface $versionHistory | ||
| * @param CollectionProcessorInterface|null $collectionProcessor | ||
| */ | ||
| public function __construct( | ||
| @@ -202,6 +201,8 @@ class UpdateRepository implements UpdateRepositoryInterface | ||
| } | ||
|
|
||
| /** | ||
| + * Retrieves rollback entity for update | ||
| + * | ||
| * @param UpdateInterface $entity | ||
| * @return int | ||
| * @throws CouldNotSaveException | ||
| @@ -218,11 +219,14 @@ class UpdateRepository implements UpdateRepositoryInterface | ||
| $rollback->setStartTime($entity->getEndTime()); | ||
| $rollback->setIsRollback(true); | ||
| } | ||
| + $rollback->setOldOriginId($entity->getOldId()); | ||
| $rollback = $this->save($rollback); | ||
| return $rollback->getId(); | ||
| } | ||
|
|
||
| /** | ||
| + * Retrieves id for entity | ||
| + * | ||
| * @param UpdateInterface $entity | ||
| * @return int | ||
| */ | ||
| @@ -240,7 +244,7 @@ class UpdateRepository implements UpdateRepositoryInterface | ||
| } | ||
|
|
||
| /** | ||
| - * {@inheritdoc} | ||
| + * @inheritdoc | ||
| */ | ||
| public function getVersionMaxIdByTime($timestamp) | ||
| { |
Oops, something went wrong.