jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/381070 )
Change subject: Remove hack and check for existent of message rootcategory
......................................................................
Remove hack and check for existent of message rootcategory
Since 184658eb included in MediaWiki 1.28 not existing messages return
⧼rootcategory⧽ instead of <rootcategory>.
Bug: T176904
Change-Id: I56b2f4f767abaa20fa2910ca8c40113de72785be
---
M CategoryTreePage.php
1 file changed, 7 insertions(+), 6 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CategoryTreePage.php b/CategoryTreePage.php
index 864cff9..c6501d9 100644
--- a/CategoryTreePage.php
+++ b/CategoryTreePage.php
@@ -49,15 +49,16 @@
if ( $par ) {
$this->target = $par;
} else {
- $this->target = $request->getVal( 'target', $this->msg(
'rootcategory' )->text() );
+ $this->target = $request->getVal( 'target' );
+ if ( $this->target === null ) {
+ $rootcategory = $this->msg( 'rootcategory' );
+ if ( $rootcategory->exists() ) {
+ $this->target = $rootcategory->text();
+ }
+ }
}
$this->target = trim( $this->target );
-
- # HACK for undefined root category
- if ( $this->target == '<rootcategory>' || $this->target ==
'<rootcategory>' ) {
- $this->target = null;
- }
$options = [];
--
To view, visit https://gerrit.wikimedia.org/r/381070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I56b2f4f767abaa20fa2910ca8c40113de72785be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CategoryTree
Gerrit-Branch: master
Gerrit-Owner: Fomafix <foma...@googlemail.com>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
