@@ -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), |
@@ -148,8 +148,7 @@ |
||
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 |
@@ -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), |