Merge pull request neos#1403 from Sebobo/3.0

TASK: Don’t use deprecated hostpattern methods
davidspiola · Jan 27, 2017 · 537470b · 537470b
2 parents 83c2a59 + 423223a
commit 537470b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Neos.Neos/Classes/Controller/Backend/MenuHelper.php b/Neos.Neos/Classes/Controller/Backend/MenuHelper.php
@@ -68,7 +68,7 @@ public function buildSiteList(ControllerContext $controllerContext)
             /** @var $site Site */
             if ($site->hasActiveDomains()) {
                 $activeHostPatterns = $site->getActiveDomains()->map(function ($domain) {
-                    return $domain->getHostPattern();
+                    return $domain->getHostname();
                 })->toArray();
                 $active = in_array($requestUriHost, $activeHostPatterns, true);
                 if ($active) {

diff --git a/Neos.Neos/Classes/Service/LinkingService.php b/Neos.Neos/Classes/Service/LinkingService.php
@@ -301,7 +301,7 @@ public function createNodeUri(ControllerContext $controllerContext, $node = null
         if ($site->hasActiveDomains()) {
             $requestUriHost = $request->getHttpRequest()->getBaseUri()->getHost();
             $activeHostPatterns = $site->getActiveDomains()->map(function ($domain) {
-                return $domain->getHostPattern();
+                return $domain->getHostname();
             })->toArray();
             if (!in_array($requestUriHost, $activeHostPatterns, true)) {
                 $uri = $this->createSiteUri($controllerContext, $site) . '/' . ltrim($uri, '/');