Skip to content

Fix wrong skin, template, locale in ESI blocks #1538

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

Fix wrong skin, template, locale in ESI blocks #1538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/code/community/Nexcessnet/Turpentine/Model/Observer/Esi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,12 @@ protected function _getEsiData($blockObject, $esiOptions) {
$esiData = new Varien_Object();
$esiData->setStoreId(Mage::app()->getStore()->getId());
$esiData->setDesignPackage(Mage::getDesign()->getPackageName());
$esiData->setDesignTheme(Mage::getDesign()->getTheme('layout'));
$esiData->setDesignTheme(array(
'layout' => Mage::getDesign()->getTheme('layout'),
'template' => Mage::getDesign()->getTheme('template'),
'skin' => Mage::getDesign()->getTheme('skin'),
'locale' => Mage::getDesign()->getTheme('locale')
));
$esiData->setNameInLayout($blockObject->getNameInLayout());
$esiData->setBlockType(get_class($blockObject));
$esiData->setLayoutHandles($this->_getBlockLayoutHandles($blockObject));
Expand Down
14 changes: 11 additions & 3 deletions app/code/community/Nexcessnet/Turpentine/controllers/EsiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,17 @@ protected function _getEsiBlock($esiData) {
}
}
$layout = Mage::getSingleton('core/layout');
Mage::getSingleton('core/design_package')
->setPackageName($esiData->getDesignPackage())
->setTheme($esiData->getDesignTheme());
$package = Mage::getSingleton('core/design_package')
->setPackageName($esiData->getDesignPackage());
$theme = $esiData->getDesignTheme();
if (is_array($theme)) {
foreach ($theme as $type => $name) {
$package->setTheme($type, $name);
}
} else {
// for backwards compatibility during upgrades
$package->setTheme($theme);
}

// This is, (roughly), the start of Action->loadLayout
// - Mimicking Action->addActionLayoutHandles (Though we are using the esi data to set)
Expand Down