From c7cd0eaf2545dee7fa370481d7c8e0381ba075da Mon Sep 17 00:00:00 2001 From: Alexander Vorwerk Date: Tue, 2 Apr 2024 00:38:38 +0200 Subject: [PATCH] SECURITY: Get Actions: Hide links for hidden users Bug: T361479 Change-Id: I727e655099b53f10903a33d02a8b9fdee78d0933 --- .../Pagers/CheckUserGetActionsPager.php | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/CheckUser/Pagers/CheckUserGetActionsPager.php b/src/CheckUser/Pagers/CheckUserGetActionsPager.php index a017a40c..0af663bc 100644 --- a/src/CheckUser/Pagers/CheckUserGetActionsPager.php +++ b/src/CheckUser/Pagers/CheckUserGetActionsPager.php @@ -166,8 +166,19 @@ class CheckUserGetActionsPager extends AbstractCheckUserPager { */ public function formatRow( $row ): string { $templateParams = []; - // Create diff/hist/page links - $templateParams['links'] = $this->getLinksFromRow( $row ); + + $user = new UserIdentityValue( $row->user ?? 0, $user_text ); + if ( $row->type == RC_EDIT || $row->type == RC_NEW ) { + $hidden = !$this->usernameVisibility[$row->this_oldid]; + } else { + $hidden = $this->userFactory->newFromUserIdentity( $user )->isHidden() + && !$this->getAuthority()->isAllowed( 'hideuser' ); + } + + if ( !$hidden ) { + // Create diff/hist/page links + $templateParams['links'] = $this->getLinksFromRow( $row ); + } // Show date $templateParams['timestamp'] = $this->getLanguage()->userTime( wfTimestamp( TS_MW, $row->timestamp ), $this->getUser() ); @@ -182,13 +193,6 @@ class CheckUserGetActionsPager extends AbstractCheckUserPager { $user_text = IPUtils::prettifyIP( $user_text ) ?? $user_text; } // Userlinks - $user = new UserIdentityValue( $row->user ?? 0, $user_text ); - if ( $row->type == RC_EDIT || $row->type == RC_NEW ) { - $hidden = !$this->usernameVisibility[$row->this_oldid]; - } else { - $hidden = $this->userFactory->newFromUserIdentity( $user )->isHidden() - && !$this->getAuthority()->isAllowed( 'hideuser' ); - } if ( $hidden ) { $templateParams['userLink'] = Html::element( 'span', -- 2.34.1