Completed
Pull Request — devel (#1352)
by
unknown
04:24
created
app/code/community/Nexcessnet/Turpentine/Block/Poll/ActivePoll.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
     public function setTemplate($template)
25 25
     {
26 26
         if ((Mage::getConfig()->getModuleConfig('Mage_Poll')->is('active', 'true')) &&
27
-        (!Mage::getStoreConfig('advanced/modules_disable_output/Mage_Poll')))
27
+        ( ! Mage::getStoreConfig('advanced/modules_disable_output/Mage_Poll')))
28 28
         {
29 29
             $this->_template = $template;
30 30
             $this->setPollTemplate('turpentine/ajax.phtml', 'poll');
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/Abstract.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -750,9 +750,9 @@  discard block
 block discarded – undo
750 750
                     "Connection: close";
751 751
             }
752 752
 EOS;
753
-            $additionalHeader='';
754
-            if ($urlParts['scheme']==='https'){
755
-                $additionalHeader="\n                    \"X-Forwarded-Proto: https\"";
753
+            $additionalHeader = '';
754
+            if ($urlParts['scheme'] === 'https') {
755
+                $additionalHeader = "\n                    \"X-Forwarded-Proto: https\"";
756 756
             }
757 757
             $vars = array(
758 758
                 'probe_host'  => $urlParts['host'],
@@ -996,7 +996,7 @@  discard block
 block discarded – undo
996 996
     }
997 997
 }
998 998
 EOS;
999
-        } else{
999
+        } else {
1000 1000
             $tpl_750 = '
1001 1001
 sub vcl_synth {
1002 1002
     if (resp.status == 750) {
Please login to merge, or discard this patch.