silverstripe / multi-domain

code/MultiDomain.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
      */
     public static function get_all_domains($includePrimary = false)
     {
-        $domains = array ();
+        $domains = array();
 
         foreach (self::config()->domains as $key => $config) {
             if (!$includePrimary && $key === self::KEY_PRIMARY) {

code/MultiDomainDomain.php

Spacing +4 added lines, -5 removed lines

@@ -68,8 +68,8 @@ 
 
         $globalAllowed = (array) Config::inst()->get('MultiDomain', 'allow');
         $globalForced = (array) Config::inst()->get('MultiDomain', 'force');
-        $myAllowed = isset($config['allow']) ? $config['allow'] : array ();
-        $myForced = isset($config['force']) ? $config['force'] : array ();
+        $myAllowed = isset($config['allow']) ? $config['allow'] : array();
+        $myForced = isset($config['force']) ? $config['force'] : array();
         $this->allowedPaths = array_merge($globalAllowed, $myAllowed);
         $this->forcedPaths = array_merge($globalForced, $myForced);
 
@@ -113,8 +113,7 @@ 
         $hostname = $this->getHostname();
 
         return $allow_subdomains ?
-                    (bool) preg_match('/(\.|^)'.$hostname.'$/', $currentHost) :
-                    ($currentHost == $hostname);
+                    (bool) preg_match('/(\.|^)'.$hostname.'$/', $currentHost) : ($currentHost == $hostname);
     }
 
     /**
@@ -160,7 +159,7 @@ 
         }
 
         $domainUrl = str_replace('/', '\/', $this->getURL());
-        return preg_replace('/^\/?' . $domainUrl . '\//', '', $url);
+        return preg_replace('/^\/?'.$domainUrl.'\//', '', $url);
     }
 
     /**