Completed
Push — master ( 33e41e...dd7fe6 )
by Nicolaas
02:41
created
code/control/CountryPrice_Page_Controller_Extension.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
         parse_str($urlParts['query'], $params);
92 92
 
93 93
         $param = Config::inst()->get('CountryPrice_Page_Controller_Extension', 'locale_get_parameter');
94
-        $params[$param] = $countryCode;     // Overwrite if exists
94
+        $params[$param] = $countryCode; // Overwrite if exists
95 95
 
96 96
         // Note that this will url_encode all values
97 97
         $urlParts['query'] = http_build_query($params);
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
         if (function_exists('http_build_url')) {
101 101
             $newURL = http_build_url($urlParts);
102 102
         } else {
103
-            $newURL =  $urlParts['scheme'] . '://' . $urlParts['host'] . $urlParts['path'] . '?' . $urlParts['query'];
103
+            $newURL = $urlParts['scheme'].'://'.$urlParts['host'].$urlParts['path'].'?'.$urlParts['query'];
104 104
         }
105 105
 
106 106
         if ($oldURL !== $newURL && self::$_redirection_count < 3) {
Please login to merge, or discard this patch.
code/model/address/CountryPrice_EcommerceCountry.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
                     'Root.FAQPage',
89 89
                     new LiteralField(
90 90
                         "FAQPageExplanation",
91
-                        "<p class=\"message warning\">FAQ information can only be added to the main country for a ". _t('Distributor.SINGULAR_NAME', 'Distributor') ."</p>"
91
+                        "<p class=\"message warning\">FAQ information can only be added to the main country for a "._t('Distributor.SINGULAR_NAME', 'Distributor')."</p>"
92 92
                     )
93 93
                 );
94 94
             }
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
         $order = ShoppingCart::current_order();
201 201
 
202 202
         //get country from EcommerceCountry
203
-        if (! $country) {
203
+        if (!$country) {
204 204
             $country = EcommerceCountry::get_country();
205 205
         }
206 206
 
@@ -240,9 +240,9 @@  discard block
 block discarded – undo
240 240
     public static function get_backup_country()
241 241
     {
242 242
         $obj = EcommerceCountry::get()->filter(array("IsBackupCountry" => true))->first();
243
-        if (! $obj) {
243
+        if (!$obj) {
244 244
             $obj = EcommerceCountry::get()->filter(array("Code" => EcommerceConfig::get('EcommerceCountry', 'default_country_code')))->first();
245
-            if (! $obj) {
245
+            if (!$obj) {
246 246
                 $obj = EcommerceCountry::get()->first();
247 247
             }
248 248
         }
Please login to merge, or discard this patch.