Merge branch 'issue-18941' of https://github.com/Nazar65/magento2 into issue-18941

Author: Nazar65

app/code/Magento/Store/Model/Store.php

@@ -1158,18 +1158,21 @@ public function isDefault()
      * Retrieve current url for store
      *
      * @param bool $fromStore
-     * @param bool $clearUrl
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function getCurrentUrl($fromStore = true, $clearUrl = false)
+    public function getCurrentUrl($fromStore = true)
     {
         $sidQueryParam = $this->_sidResolver->getSessionIdQueryParam($this->_getSession());
         $requestString = $this->_url->escape(ltrim($this->_request->getRequestString(), '/'));
 
         $storeUrl = $this->getUrl('', ['_secure' => $this->_storeManager->getStore()->isCurrentlySecure()]);
 
+        if ($this->_config->getValue(self::XML_PATH_STORE_IN_URL)) {
+            $storeUrl   = preg_replace('/\/'.$this->getCode().'{1}/','',$storeUrl);
+        }
+
         if (!filter_var($storeUrl, FILTER_VALIDATE_URL)) {
             return $storeUrl;
         }
@@ -1212,10 +1215,6 @@ public function getCurrentUrl($fromStore = true, $clearUrl = false)
 
         $currentUrlQueryParams = array_merge($requestString, $storeParsedQuery);
 
-        if ($clearUrl !== false) {
-            $currentUrlQueryParams = false;
-        }
-
         $currentUrl = $storeParsedUrl['scheme']
             . '://'
             . $storeParsedUrl['host']