Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/405560 )
Change subject: Update RelPath calls
......................................................................
Update RelPath calls
Bug: T182273
Change-Id: Ifd04e3b3ab72cc56bef48a1fc18fccb34b0af618
---
M includes/OutputPage.php
M includes/resourceloader/ResourceLoaderModule.php
2 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/60/405560/1
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index e8b000e..c17d50f 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -23,6 +23,7 @@
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
use MediaWiki\Session\SessionManager;
+use Wikimedia\RelPath;
use WrappedString\WrappedString;
use WrappedString\WrappedStringList;
@@ -3818,7 +3819,7 @@
$remotePathPrefix = $remotePath = $uploadPath;
}
- $path = RelPath\getRelativePath( $path, $remotePath );
+ $path = RelPath::getRelativePath( $path, $remotePath );
return self::transformFilePath( $remotePathPrefix, $localDir,
$path );
}
diff --git a/includes/resourceloader/ResourceLoaderModule.php
b/includes/resourceloader/ResourceLoaderModule.php
index 4deb7fa..a6ec72a 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -26,6 +26,7 @@
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
+use Wikimedia\RelPath;
use Wikimedia\ScopedCallback;
/**
@@ -527,7 +528,7 @@
public static function getRelativePaths( array $filePaths ) {
global $IP;
return array_map( function ( $path ) use ( $IP ) {
- return RelPath\getRelativePath( $path, $IP );
+ return RelPath::getRelativePath( $path, $IP );
}, $filePaths );
}
@@ -541,7 +542,7 @@
public static function expandRelativePaths( array $filePaths ) {
global $IP;
return array_map( function ( $path ) use ( $IP ) {
- return RelPath\joinPath( $IP, $path );
+ return RelPath::joinPath( $IP, $path );
}, $filePaths );
}
--
To view, visit https://gerrit.wikimedia.org/r/405560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd04e3b3ab72cc56bef48a1fc18fccb34b0af618
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
