@@ -190,8 +190,8 @@ discard block |
||
190 | 190 | */ |
191 | 191 | protected function _getAdminFrontname() { |
192 | 192 | if (Mage::getStoreConfig('admin/url/use_custom_path')) { |
193 | - if(Mage::getStoreConfig('web/url/use_store')) { |
|
194 | - return Mage::getModel('core/store')->load(0)->getCode() . "/" . Mage::getStoreConfig('admin/url/custom_path'); |
|
193 | + if (Mage::getStoreConfig('web/url/use_store')) { |
|
194 | + return Mage::getModel('core/store')->load(0)->getCode()."/".Mage::getStoreConfig('admin/url/custom_path'); |
|
195 | 195 | } else { |
196 | 196 | return Mage::getStoreConfig('admin/url/custom_path'); |
197 | 197 | } |
@@ -905,8 +905,8 @@ discard block |
||
905 | 905 | */ |
906 | 906 | protected function _vcl_sub_https_redirect_fix() { |
907 | 907 | $baseUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB); |
908 | - $baseUrl = str_replace(array('http://','https://'), '', $baseUrl); |
|
909 | - $baseUrl = rtrim($baseUrl,'/'); |
|
908 | + $baseUrl = str_replace(array('http://', 'https://'), '', $baseUrl); |
|
909 | + $baseUrl = rtrim($baseUrl, '/'); |
|
910 | 910 | |
911 | 911 | $tpl = <<<EOS |
912 | 912 | if ( (req.http.host ~ "^(?i)www.$baseUrl" || req.http.host ~ "^(?i)$baseUrl") && req.http.X-Forwarded-Proto !~ "(?i)https") { |