Completed
Push — devel ( ebfb1d...9ca734 )
by Miguel
02:53
created
app/code/community/Nexcessnet/Turpentine/controllers/EsiController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -183,9 +183,9 @@
 block discarded – undo
183 183
             }
184 184
         }
185 185
         $layout = Mage::getSingleton('core/layout');
186
-        Mage::getSingleton( 'core/design_package' )
187
-                ->setPackageName( $esiData->getDesignPackage() )
188
-                ->setTheme( $esiData->getDesignTheme() );
186
+        Mage::getSingleton('core/design_package')
187
+                ->setPackageName($esiData->getDesignPackage())
188
+                ->setTheme($esiData->getDesignTheme());
189 189
 
190 190
         // dispatch event for adding handles to layout update
191 191
         Mage::dispatchEvent(
Please login to merge, or discard this patch.
app/code/community/Nexcessnet/Turpentine/Model/Observer/Esi.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -227,9 +227,9 @@  discard block
 block discarded – undo
227 227
                 'Checking ESI block candidate: %s',
228 228
                 $blockObject->getNameInLayout() ? $blockObject->getNameInLayout() : $blockObject->getModuleName() );
229 229
 
230
-            $debugHelper->logInfo( "-- block testing: shouldResponseUseEsi = " . $esiHelper->shouldResponseUseEsi());
231
-            $debugHelper->logInfo( "-- block testing: instanceof Mage_Core_Block_Template = " . $blockObject instanceof Mage_Core_Block_Template );
232
-            $debugHelper->logInfo( "-- block testing: Esi Options = " . print_r($blockObject->getEsiOptions(), true) );
230
+            $debugHelper->logInfo("-- block testing: shouldResponseUseEsi = ".$esiHelper->shouldResponseUseEsi());
231
+            $debugHelper->logInfo("-- block testing: instanceof Mage_Core_Block_Template = ".$blockObject instanceof Mage_Core_Block_Template);
232
+            $debugHelper->logInfo("-- block testing: Esi Options = ".print_r($blockObject->getEsiOptions(), true));
233 233
         }        
234 234
         if ($esiHelper->shouldResponseUseEsi() &&
235 235
                 $blockObject instanceof Mage_Core_Block_Template &&
@@ -332,8 +332,8 @@  discard block
 block discarded – undo
332 332
         $methodParam = $esiHelper->getEsiMethodParam();
333 333
         $esiData = new Varien_Object();
334 334
         $esiData->setStoreId(Mage::app()->getStore()->getId());
335
-        $esiData->setDesignPackage( Mage::getDesign()->getPackageName() );
336
-        $esiData->setDesignTheme( Mage::getDesign()->getTheme( 'layout' ) );
335
+        $esiData->setDesignPackage(Mage::getDesign()->getPackageName());
336
+        $esiData->setDesignTheme(Mage::getDesign()->getTheme('layout'));
337 337
         $esiData->setNameInLayout($blockObject->getNameInLayout());
338 338
         $esiData->setBlockType(get_class($blockObject));
339 339
         $esiData->setLayoutHandles($this->_getBlockLayoutHandles($blockObject));
Please login to merge, or discard this patch.