wikimedia/mediawiki-extensions-CategoryTree
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CategoryTree synced 2024-11-27 17:51:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Simplify CategoryTree::capDepth"

Browse source
This commit is contained in:
jenkins-bot 2021-08-24 09:30:11 +00:00 committed by Gerrit Code Review
parent 20f433c17c c7b79338d5
commit 6cba244a94
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
includes/CategoryTree.php
View file

@ -802,7 +802,6 @@ class CategoryTree {
/** /**
* Internal function to cap depth * Internal function to cap depth
* @suppress PhanPluginDuplicateConditionalNullCoalescing until PHP7 is required
* @param string $mode * @param string $mode
* @param int $depth * @param int $depth
* @return int|mixed * @return int|mixed
@ -810,14 +809,14 @@ class CategoryTree {
public static function capDepth( $mode, $depth ) { public static function capDepth( $mode, $depth ) {
global $wgCategoryTreeMaxDepth; global $wgCategoryTreeMaxDepth;
if ( is_numeric( $depth ) ) { if ( !is_numeric( $depth ) ) {
$depth = intval( $depth );
} else {
return 1; return 1;
} }
$depth = intval( $depth );
if ( is_array( $wgCategoryTreeMaxDepth ) ) { if ( is_array( $wgCategoryTreeMaxDepth ) ) {
$max = isset( $wgCategoryTreeMaxDepth[$mode] ) ? $wgCategoryTreeMaxDepth[$mode] : 1; $max = $wgCategoryTreeMaxDepth[$mode] ?? 1;
} elseif ( is_numeric( $wgCategoryTreeMaxDepth ) ) { } elseif ( is_numeric( $wgCategoryTreeMaxDepth ) ) {
$max = $wgCategoryTreeMaxDepth; $max = $wgCategoryTreeMaxDepth;
} else { } else {