Merge remote-tracking branch 'origin/MAGETWO-43644-custom-admin-redirect' into PR_Branch

Author: Olga Kopylova

app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php

@@ -33,38 +33,31 @@ class AfterCustomUrlChangedObserver implements ObserverInterface
      */
     protected $_response;
 
-    /**
-     * @var \Magento\Store\Model\StoreManagerInterface
-     */
-    protected $_storeManager;
-
     /**
      * @param \Magento\Backend\Helper\Data $backendData
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\App\ResponseInterface $response
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Backend\Helper\Data $backendData,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Backend\Model\Auth\Session $authSession,
-        \Magento\Framework\App\ResponseInterface $response,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        \Magento\Framework\App\ResponseInterface $response
     ) {
         $this->_backendData = $backendData;
         $this->_coreRegistry = $coreRegistry;
         $this->_authSession = $authSession;
         $this->_response = $response;
-        $this->_storeManager = $storeManager;
     }
 
     /**
-     * Log out user and redirect him to new admin custom url
+     * Log out user and redirect to new admin custom url
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.ExitExpression)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -73,10 +66,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
 
         $this->_authSession->destroy();
-
-        $route = $this->_backendData->getAreaFrontName();
-
-        $this->_response->setRedirect($this->_storeManager->getStore()->getBaseUrl() . $route)->sendResponse();
+        $adminUrl = $this->_backendData->getHomePageUrl();
+        $this->_response->setRedirect($adminUrl)->sendResponse();
         exit(0);
     }
 }