Merge remote-tracking branch 'origin/MAGETWO-89066' into 2.1.13-develop-pr48

Author: zakdma

app/code/Magento/Backend/Model/Url.php

@@ -198,7 +198,9 @@ public function getUrl($routePath = null, $routeParams = null)
             return $result;
         }
 
+        $this->getRouteParamsResolver()->unsetData('route_params');
         $this->_setRoutePath($routePath);
+        $extraParams = $this->getRouteParamsResolver()->getRouteParams();
         $routeName = $this->_getRouteName('*');
         $controllerName = $this->_getControllerName(self::DEFAULT_CONTROLLER_NAME);
         $actionName = $this->_getActionName(self::DEFAULT_ACTION_NAME);
@@ -213,6 +215,10 @@ public function getUrl($routePath = null, $routeParams = null)
             $routeParams[self::SECRET_KEY_PARAM_NAME] = $secretKey;
         }
 
+        if (!empty($extraParams)) {
+            $routeParams = array_merge($extraParams, $routeParams);
+        }
+
         return parent::getUrl("{$routeName}/{$controllerName}/{$actionName}", $routeParams);
     }
 

dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php

@@ -75,6 +75,9 @@ public function testGetUrl()
         ];
         $url = $this->_model->getUrl('path', $routeParams);
         $this->assertContains('/param4/' . $paramEncoder->encode('a4==') . '/', $url);
+
+        $url = $this->_model->getUrl('route/controller/action/id/100');
+        $this->assertContains('id/100', $url);
     }
 
     /**