#11211 Fix Store View switcher #11337
Merged
Conversation
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
|
|
vkublytskyi
suggested changes
Oct 20, 2017
| @@ -1166,6 +1166,9 @@ public function getCurrentUrl($fromStore = true) | |||
| if (!$this->isUseStoreInUrl()) { | |||
| $storeParsedQuery['___store'] = $this->getCode(); | |||
| } | |||
| if ($this->getCode() !== $this->_storeManager->getStore()->getCode()) { | |||
There was a problem hiding this comment.
@thiagolima-bm Please explain why usage of __from_store query parameter should be used.
There was a problem hiding this comment.
for tracking, maybe?
|
|
||
| //avoid query params duplication | ||
| if (!preg_match('/___store=(.*?)&___from_store=(.*?)/', $requestString)) { | ||
| $currentUrl .= $requestString; |
There was a problem hiding this comment.
$requestCode also contains path and this data may be lost
STR:
- go to Privacy and Cookie Policy
- switch store view (store view switched, user still on Privacy and Cookie Policy)
- switch store view again (store view switched, user on main page but should be on Privacy and Cookie Policy)
| $currentUrl .= $requestString; | ||
| } | ||
|
|
||
| $currentUrl .= ($storeParsedQuery ? '?' . http_build_query($storeParsedQuery, '', '&') : ''); |
There was a problem hiding this comment.
I think the source of the issue is concatenation with ? while $requestString may contain query. To fix this I propose:
- Split
$requestStringinto path and query:
$requestStringParts = explode('?', $requestString, 2);
$requestStringPath = $requestStringParts[0];
if (isset($requestStringParts[1])) {
parse_string($requestStringParts[1], $requestStringQuery);
} else {
$requestStringQuery = []
}- Merge original query params and store parsed query
$currentUrlQueryParams = array_merge($requestStringQuery, $storeParsedQuery);- Safely concatenate all parts of url:
$currentUrl = $storeParsedUrl['scheme']
. '://'
. $storeParsedUrl['host']
. (isset($storeParsedUrl['port']) ? ':' . $storeParsedUrl['port'] : '')
. $storeParsedUrl['path']
. $requestStringPath
. ($currentUrlQueryParams ? '?' . http_build_query($currentUrlQueryParams, '', '&') : '');
This was referenced Oct 20, 2017
|
@vkublytskyi fixes applied. |
vkublytskyi
approved these changes
Oct 30, 2017
magento-team
pushed a commit
that referenced
this pull request
Oct 31, 2017
magento-team
pushed a commit
that referenced
this pull request
Oct 31, 2017
[EngCom] Public Pull Requests - 2.2-develop - MAGETWO-82955: [Backport 2.2-develop] FIX show visual swatches in admin - product attribute #11747 - MAGETWO-82943: Magetwo 70954: Remove the component.clear from the custom options type. This causes the 'elem' array to become out of sync with the recordData #11824 - MAGETWO-82710: Fix issue #10032 - Download back-up .tgz always takes the latest that's created (2.2-develop) #11595 - MAGETWO-81994: Products added to cart with REST API give total prices equal to zero #11458 - MAGETWO-81422: #11211 Fix Store View switcher #11337
magento-engcom-team
added
Reproduced on 2.2.x
|
Gents, still not able to manage this issue to get it work (( |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Store View switcher not working on front-end and it throws an error #11211 #10908