Skip to content

Commit 8dd13c4

Browse files
committed
MAGETWO-98345: [2.1.0] underscore in site url breaks admin redirect - The page isn't redirecting properly #5809
1 parent 446de2d commit 8dd13c4

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

app/code/Magento/Config/Model/Config/Backend/Baseurl.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ private function _validateFullyQualifiedUrl($value)
201201
*/
202202
private function _isFullyQualifiedUrl($value)
203203
{
204-
$url = parse_url($value);
205204
return preg_match('/\/$/', $value) && $this->getUrlValidator()->isValid($value, ['http', 'https']);
206205
}
207206

dev/tests/integration/testsuite/Magento/Setup/Controller/UrlCheckTest.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © 2016 Magento. All rights reserved.
3+
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\Setup\Controller;
@@ -21,12 +21,11 @@ protected function setUp()
2121
$this->controller = Bootstrap::getObjectManager()->create(UrlCheck::class);
2222
}
2323

24-
/**
25-
* @param array $requestContent
26-
* @param bool $successUrl
27-
* @param bool $successSecureUrl
28-
* @return void
29-
* @dataProvider indexActionDataProvider
24+
/**
25+
* @param $requestContent
26+
* @param $successUrl
27+
* @param $successSecureUrl
28+
* @throws \ReflectionException
3029
*/
3130
public function testIndexAction($requestContent, $successUrl, $successSecureUrl)
3231
{

0 commit comments

Comments
 (0)