Merge remote-tracking branch 'origin/MAGETWO-45023-wrong-setup-links' into PR_Branch

Ivan Gavryshko · Ivan Gavryshko · commit e2d21f4bdf86 · 2015-11-04T18:58:43.000-06:00
diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js
@@ -40,7 +40,7 @@ main.controller('navigationController',
     function ($scope, $state, navigationService, $localStorage, $interval, $http) {
         $interval(
             function () {
-                $http.post('/setup/index.php/session/prolong')
+                $http.post('index.php/session/prolong')
                     .success(function (result) {
                     })
                     .error(function (result) {
diff --git a/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php b/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php
@@ -120,7 +120,7 @@ public function authPreDispatch($event)
                 );
 
                 if (!$objectManager->get('Magento\Backend\Model\Auth')->isLoggedIn()) {
-                    $controller->plugin('redirect')->toUrl('/setup/index.php/session/unlogin');
+                    $controller->plugin('redirect')->toUrl('index.php/session/unlogin');
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public function authPreDispatch($event)`
`120`	`120`	`);`
`121`	`121`
`122`	`122`	`if (!$objectManager->get('Magento\Backend\Model\Auth')->isLoggedIn()) {`
`123`		`- $controller->plugin('redirect')->toUrl('/setup/index.php/session/unlogin');`
	`123`	`+ $controller->plugin('redirect')->toUrl('index.php/session/unlogin');`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`	`}`