Completed
Pull Request — master (#1284)
by
unknown
02:47
created
app/code/community/Nexcessnet/Turpentine/Block/Poll/ActivePoll.php 2 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -21,19 +21,19 @@
 block discarded – undo
21 21
 
22 22
 class Nexcessnet_Turpentine_Block_Poll_ActivePoll extends Mage_Poll_Block_ActivePoll {
23 23
 
24
-	public function setTemplate($template)
25
-	{
26
-		if ((Mage::getConfig()->getModuleConfig('Mage_Poll')->is('active', 'true')) &&
27
-		(!Mage::getStoreConfig('advanced/modules_disable_output/Mage_Poll')))
28
-		{
29
-			$this->_template = $template;
30
-			$this->setPollTemplate('turpentine/ajax.phtml', 'poll');
31
-			$this->setPollTemplate('turpentine/ajax.phtml', 'results');
32
-		}
33
-		else
34
-		{
35
-			// Mage_Poll is disabled, so do nothing
36
-		}
37
-		return $this;
38
-	}
24
+    public function setTemplate($template)
25
+    {
26
+        if ((Mage::getConfig()->getModuleConfig('Mage_Poll')->is('active', 'true')) &&
27
+        (!Mage::getStoreConfig('advanced/modules_disable_output/Mage_Poll')))
28
+        {
29
+            $this->_template = $template;
30
+            $this->setPollTemplate('turpentine/ajax.phtml', 'poll');
31
+            $this->setPollTemplate('turpentine/ajax.phtml', 'results');
32
+        }
33
+        else
34
+        {
35
+            // Mage_Poll is disabled, so do nothing
36
+        }
37
+        return $this;
38
+    }
39 39
 }
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,8 +29,7 @@
 block discarded – undo
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
 		}
Please login to merge, or discard this patch.
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.