Completed
Pull Request — devel (#1164)
by
unknown
02:49
created
contrib/tools/esi-decoder.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
-     * ESI DECODER
4
-     *
5
-     * This tool can be used to decode an ESI request.
6
-     * You can just paste the whole ESI URL and push the button to decode it.
7
-     *
8
-     * Make sure you place this utility on a protected spot on your web server where only authorized users can use it.
9
-     *
10
-     * If the URLs you see in "varnishlog" or "varnishncsa" are not working because they are cut off, read this FAQ item:
11
-     * https://github.com/nexcess/magento-turpentine/wiki/FAQ#im-using-varnishncsa-to-generate-logs-and-the-esi-urls-are-cut-off-how-do-i-get-the-full-url-in-the-logs
12
-     *
13
-     */
3
+ * ESI DECODER
4
+ *
5
+ * This tool can be used to decode an ESI request.
6
+ * You can just paste the whole ESI URL and push the button to decode it.
7
+ *
8
+ * Make sure you place this utility on a protected spot on your web server where only authorized users can use it.
9
+ *
10
+ * If the URLs you see in "varnishlog" or "varnishncsa" are not working because they are cut off, read this FAQ item:
11
+ * https://github.com/nexcess/magento-turpentine/wiki/FAQ#im-using-varnishncsa-to-generate-logs-and-the-esi-urls-are-cut-off-how-do-i-get-the-full-url-in-the-logs
12
+ *
13
+ */
14 14
 
15 15
 $tries = 5;
16 16
 $dir = dirname(__FILE__);
Please login to merge, or discard this patch.
app/code/community/Nexcessnet/Turpentine/Model/Core/Session.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
      */
57 57
     public function renewFormKey()
58 58
     {
59
-     	$this->setData('_form_key', Mage::helper('core')->getRandomString(16));
59
+            $this->setData('_form_key', Mage::helper('core')->getRandomString(16));
60 60
     }
61 61
 
62 62
     /**
Please login to merge, or discard this patch.
app/code/community/Nexcessnet/Turpentine/Model/Observer/Esi.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -325,8 +325,8 @@
 block discarded – undo
325 325
         $methodParam = $esiHelper->getEsiMethodParam();
326 326
         $esiData = new Varien_Object();
327 327
         $esiData->setStoreId(Mage::app()->getStore()->getId());
328
-        $esiData->setDesignPackage( Mage::getDesign()->getPackageName() );
329
-        $esiData->setDesignTheme( Mage::getDesign()->getTheme( 'layout' ) );
328
+        $esiData->setDesignPackage(Mage::getDesign()->getPackageName());
329
+        $esiData->setDesignTheme(Mage::getDesign()->getTheme('layout'));
330 330
         $esiData->setNameInLayout($blockObject->getNameInLayout());
331 331
         $esiData->setBlockType(get_class($blockObject));
332 332
         $esiData->setLayoutHandles($this->_getBlockLayoutHandles($blockObject));
Please login to merge, or discard this patch.
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.