Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "filebackend: Avoid passing null to FileBackend::normalizeContainerPath" into REL1_43

Browse source
This commit is contained in:
jenkins-bot 2025-04-11 17:14:00 +00:00 committed by Gerrit Code Review
commit 0422213b8a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/libs/filebackend/FileBackendStore.php
View file

@ -1623,7 +1623,7 @@ abstract class FileBackendStore extends FileBackend {
*/ */
final protected function resolveStoragePath( $storagePath ) { final protected function resolveStoragePath( $storagePath ) {
[ $backend, $shortCont, $relPath ] = self::splitStoragePath( $storagePath ); [ $backend, $shortCont, $relPath ] = self::splitStoragePath( $storagePath );
if ( $backend === $this->name ) { // must be for this backend if ( $backend === $this->name && $relPath !== null ) { // must be for this backend
$relPath = self::normalizeContainerPath( $relPath ); $relPath = self::normalizeContainerPath( $relPath );
if ( $relPath !== null && self::isValidShortContainerName( $shortCont ) ) { if ( $relPath !== null && self::isValidShortContainerName( $shortCont ) ) {
// Get shard for the normalized path if this container is sharded // Get shard for the normalized path if this container is sharded