From a3c61d717e346e5e848adc6914cd62f7126badea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerg=C5=91=20Tisza?= Date: Sat, 26 Aug 2017 00:32:15 +0000 Subject: [PATCH] Fix RestbaseVirtualRESTService URL standardization The regex /?$ will add a second slash to URLs which already end in a slash (since it will match both the trailing slash and the empty position after it), which is enough to trip up HyperSwitch. Change-Id: I675f8252a2496ace4d6c364a869776dff604df59 --- includes/libs/virtualrest/RestbaseVirtualRESTService.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/includes/libs/virtualrest/RestbaseVirtualRESTService.php b/includes/libs/virtualrest/RestbaseVirtualRESTService.php index 35c45deb50..90865ffcf1 100644 --- a/includes/libs/virtualrest/RestbaseVirtualRESTService.php +++ b/includes/libs/virtualrest/RestbaseVirtualRESTService.php @@ -61,11 +61,9 @@ class RestbaseVirtualRESTService extends VirtualRESTService { 'fixedUrl' => false, ], $params ); // Ensure that the url parameter has a trailing slash. - $mparams['url'] = preg_replace( - '#/?$#', - '/', - $mparams['url'] - ); + if ( substr( $mparams['url'], -1 ) !== '/' ) { + $mparams['url'] .= '/'; + } // Ensure the correct domain format: strip protocol, port, // and trailing slash if present. This lets us use // $wgCanonicalServer as a default value, which is very convenient. -- 2.20.1