@@ -29,8 +29,7 @@ |
||
29 | 29 | $this->_template = $template; |
30 | 30 | $this->setPollTemplate('turpentine/ajax.phtml', 'poll'); |
31 | 31 | $this->setPollTemplate('turpentine/ajax.phtml', 'results'); |
32 | - } |
|
33 | - else |
|
32 | + } else |
|
34 | 33 | { |
35 | 34 | // Mage_Poll is disabled, so do nothing |
36 | 35 | } |
@@ -35,8 +35,7 @@ |
||
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), |
@@ -35,8 +35,7 @@ |
||
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), |
@@ -150,8 +150,7 @@ discard block |
||
150 | 150 | Mage::getStoreConfig('turpentine_varnish/servers/custom_vcl_template'), |
151 | 151 | array('root_dir' => Mage::getBaseDir()) |
152 | 152 | ); |
153 | - if (is_file($filePath)) { return $filePath; } |
|
154 | - else { return null; } |
|
153 | + if (is_file($filePath)) { return $filePath; } else { return null; } |
|
155 | 154 | } |
156 | 155 | |
157 | 156 | |
@@ -988,7 +987,7 @@ discard block |
||
988 | 987 | } |
989 | 988 | } |
990 | 989 | EOS; |
991 | - }else{ |
|
990 | + } else{ |
|
992 | 991 | $tpl_750 = ' |
993 | 992 | sub vcl_synth { |
994 | 993 | if (resp.status == 750) { |