wikimedia/mediawiki-extensions-Math
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Math synced 2024-11-23 15:16:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove additional v1 suffix when computing internalRestbaseURL

Browse source 
Remove additional /v1 when computing internalRestbaseURL from
virtualRestConfig as this will be added in getUrl in MathRestbaseInterface.

internalRestbaseURL was introduced in I2fbc441955a1fe417f264f31f3729ce0715f7f16.

Bug: T334842
Bug: T338381
Change-Id: If2719fb9106e1414ce8814a2fbafa5dcedb84e39
(cherry picked from commit 7c7b3324be)
This commit is contained in:
Moritz Schubotz (physikerwelt) 2023-06-08 03:05:08 +02:00 committed by Samtar
parent 3263379318
commit 4dec9419f1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Hooks.php
View file

@ -72,7 +72,7 @@ class Hooks {
$restBaseDomain
);
$internalRestbaseURL = "$restBaseUrl/$restBaseDomain/v1/";
$internalRestbaseURL = "$restBaseUrl/$restBaseDomain/";
} else {
// Default to using the external URL for internal calls as well.
$internalRestbaseURL = $fullRestbaseUrl;

4
tests/phpunit/unit/HooksTest.php
View file

@ -73,7 +73,7 @@ class HooksTest extends MediaWikiUnitTestCase {
] + $defaults,
[
'MathFullRestbaseURL' => 'https://wikimedia.org/api/rest_',
'MathInternalRestbaseURL' => 'https://restbase.internal/rest/mywiki.test/v1/',
'MathInternalRestbaseURL' => 'https://restbase.internal/rest/mywiki.test/',
]
];
@ -86,7 +86,7 @@ class HooksTest extends MediaWikiUnitTestCase {
] + $defaults,
[
'MathFullRestbaseURL' => 'https://wikimedia.org/api/rest_',
'MathInternalRestbaseURL' => 'https://restbase.internal/rest/mywiki.test/v1/',
'MathInternalRestbaseURL' => 'https://restbase.internal/rest/mywiki.test/',
]
];