Completed
Pull Request — devel (#1224)
by Aric
02:40
created
community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Version3.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,8 +35,7 @@
 block discarded – undo
35 35
         $customTemplate = $this->_getCustomTemplateFilename();
36 36
         if ($customTemplate) { 
37 37
             $tplFile = $customTemplate;
38
-        }
39
-        else { 
38
+        } else { 
40 39
             $tplFile = $this->_getVclTemplateFilename(self::VCL_TEMPLATE_FILE);
41 40
         }
42 41
         $vcl = $this->_formatTemplate(file_get_contents($tplFile),
Please login to merge, or discard this patch.
community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Abstract.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -110,8 +110,8 @@
 block discarded – undo
110 110
      * @return string
111 111
      */
112 112
     protected function _getVclTemplateFilename($baseFilename) {
113
-           $extensionDir = Mage::getModuleDir('', 'Nexcessnet_Turpentine');
114
-           return sprintf('%s/misc/%s', $extensionDir, $baseFilename);
113
+            $extensionDir = Mage::getModuleDir('', 'Nexcessnet_Turpentine');
114
+            return sprintf('%s/misc/%s', $extensionDir, $baseFilename);
115 115
     }
116 116
 
117 117
     /**
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -148,8 +148,7 @@
 block discarded – undo
148 148
             Mage::getStoreConfig('turpentine_varnish/servers/custom_vcl_template'),
149 149
             array('root_dir' => Mage::getBaseDir())
150 150
         );
151
-        if (is_file($filePath)) { return $filePath; }
152
-        else { return null; }
151
+        if (is_file($filePath)) { return $filePath; } else { return null; }
153 152
     }
154 153
 
155 154
 
Please login to merge, or discard this patch.
community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Version4.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,8 +35,7 @@
 block discarded – undo
35 35
         $customTemplate = $this->_getCustomTemplateFilename();
36 36
         if ($customTemplate) { 
37 37
             $tplFile = $customTemplate;
38
-        }
39
-        else { 
38
+        } else { 
40 39
             $tplFile = $this->_getVclTemplateFilename(self::VCL_TEMPLATE_FILE);
41 40
         }
42 41
         $vcl = $this->_formatTemplate(file_get_contents($tplFile),
Please login to merge, or discard this patch.
app/code/community/Nexcessnet/Turpentine/Model/Observer/Esi.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -227,9 +227,9 @@
 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 &&
Please login to merge, or discard this patch.