Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Devel #1368

Merged
merged 15 commits into from
Feb 21, 2017
Merged

Devel #1368

merged 15 commits into from
Feb 21, 2017

Conversation

miguelbalparda
Copy link
Contributor

No description provided.

jeroenvermeulen and others added 15 commits October 26, 2016 12:08
…found

Some themes like Ultimo use `unsetChild` to remove default Magento blocks, and create the block again with the same name but other properties in another place.
The `unsetChild` action does not remove a block from the XML, only from the object structure.
When an ESI block is requested, the controller was only looking for the name of the block in the layout XML, so in some cases it picked the removed block.
I added a check for setEsiOptions inside the block XML, with a fallback to the old behaviour.
Update our devel branch from the base repo
…defined

Example:
2016-12-15T11:01:56+00:00 ERR (3): Notice: Constant CM_REDISSESSION_LOCKING_ENABLED already defined  in /path/to/httpdocs/app/code/community/Nexcessnet/Turpentine/Model/Observer/Varnish.php on line 69
…because_of_unsetchild_v2

Fix for picking the wrong block from the layout when multiple blocks found - v2
…notice

Small fix for notice when CM_REDISSESSION_LOCKING_ENABLED is already defined
Revert "use pass instead of pipe on non GET requests to improve performance"
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
Keep params from original url
@miguelbalparda miguelbalparda merged commit 5e2f6d0 into master Feb 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants