Skip to content

Commit 2f6cb7d

Browse files
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #14481: Parameter update for post method in http client interface (by @simpleadm) - #14460: [Forwardport] Disable "Back" button on the first step of the setup (by @mastiuhin-olexandr) - #14453: [ForwardPort 2.3-develop] Remove else statements from \Magento\Framework\Session\SessionManager (by @adrian-martinez-interactiv4) - #14437: [Forwardport] Disable add to cart button when redirect to cart enabled (by @mastiuhin-olexandr) Fixed GitHub Issues: - #3489: CURL Json POST (reported by @Grohotun) has been fixed in #14481 by @simpleadm in 2.3-develop branch Related commits: 1. 1f3cc4d - #14307: Possible to press the "Previous" button while in the first step of the installation (reported by @ArjenMiedema) has been fixed in #14460 by @mastiuhin-olexandr in 2.3-develop branch Related commits: 1. 14f5227 2. 1214c4f
2 parents 0599685 + 2194c62 commit 2f6cb7d

File tree

5 files changed

+5
-28
lines changed

5 files changed

+5
-28
lines changed

app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,10 @@
4040
</div>
4141
</div>
4242
<?php endif; ?>
43-
<?php if ($block->isRedirectToCartEnabled()) : ?>
44-
<script type="text/x-magento-init">
45-
{
46-
"#product_addtocart_form": {
47-
"Magento_Catalog/product/view/validation": {
48-
"radioCheckboxClosest": ".nested"
49-
}
50-
}
51-
}
52-
</script>
53-
<?php else : ?>
5443
<script type="text/x-magento-init">
5544
{
5645
"#product_addtocart_form": {
5746
"Magento_Catalog/js/validate-product": {}
5847
}
5948
}
6049
</script>
61-
<?php endif; ?>

lib/internal/Magento/Framework/HTTP/ClientInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public function get($uri);
9999
* Make POST request
100100
*
101101
* @param string $uri full uri
102-
* @param array $params POST fields array
102+
* @param array|string $params POST fields array or string in case of JSON or XML data
103103
* @return void
104104
*/
105105
public function post($uri, $params);

lib/internal/Magento/Framework/Session/SessionManager.php

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,8 @@ public function setName($name)
317317
*/
318318
public function destroy(array $options = null)
319319
{
320-
if (null === $options) {
321-
$options = $this->defaultDestroyOptions;
322-
} else {
323-
$options = array_merge($this->defaultDestroyOptions, $options);
324-
}
320+
$options = $options ?? [];
321+
$options = array_merge($this->defaultDestroyOptions, $options);
325322

326323
if ($options['clear_storage']) {
327324
$this->clearStorage();
@@ -504,11 +501,7 @@ public function regenerateId()
504501
return $this;
505502
}
506503

507-
if ($this->isSessionExists()) {
508-
session_regenerate_id(true);
509-
} else {
510-
session_start();
511-
}
504+
$this->isSessionExists() ? session_regenerate_id(true) : session_start();
512505
$this->storage->init(isset($_SESSION) ? $_SESSION : []);
513506

514507
if ($this->sessionConfig->getUseCookies()) {

setup/pub/magento/setup/main.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@ main.controller('navigationController',
9393
return str.indexOf(suffix, str.length - suffix.length) !== -1;
9494
};
9595

96-
$scope.goToStart = function() {
97-
$scope.goToAction($state.current.type);
98-
};
99-
10096
$scope.goToBackup = function() {
10197
$state.go('root.create-backup-uninstall');
10298
};

setup/view/magento/setup/readiness-check.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<button
1919
type="button"
2020
class="btn"
21-
ng-click="goToStart()"
21+
disabled="disabled"
2222
>Back</button>
2323
</div>
2424
<div class="btn-wrap btn-wrap-try-again"

0 commit comments

Comments
 (0)