wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-23 15:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix for Watchlist Notifications for deleted pages created in 1.35"

Browse source
This commit is contained in:
jenkins-bot 2024-10-25 00:13:25 +00:00 committed by Gerrit Code Review
parent a76cc44a60 4c35cecea0
commit 052dc0a3ef
2 changed files with 48 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
includes/Formatters/EchoWatchlistChangePresentationModel.php
View file

@ -2,7 +2,9 @@
namespace MediaWiki\Extension\Notifications\Formatters; namespace MediaWiki\Extension\Notifications\Formatters;
use MediaWiki\MediaWikiServices;
use MediaWiki\SpecialPage\SpecialPage; use MediaWiki\SpecialPage\SpecialPage;
use MediaWiki\Title\Title;
class EchoWatchlistChangePresentationModel extends EchoEventPresentationModel { class EchoWatchlistChangePresentationModel extends EchoEventPresentationModel {
@ -31,7 +33,7 @@ class EchoWatchlistChangePresentationModel extends EchoEventPresentationModel {
// notification-header-watchlist-restored // notification-header-watchlist-restored
$msg = $this->getMessageWithAgent( "notification-header-watchlist-" . $status ); $msg = $this->getMessageWithAgent( "notification-header-watchlist-" . $status );
} }
$msg->params( $this->getTruncatedTitleText( $this->event->getTitle(), true ) ); $msg->params( $this->getTruncatedTitleText( $this->getEventTitle(), true ) );
$msg->params( $this->getViewingUserForGender() ); $msg->params( $this->getViewingUserForGender() );
$msg->numParams( $this->getBundleCount() ); $msg->numParams( $this->getBundleCount() );
return $msg; return $msg;
@ -40,7 +42,7 @@ class EchoWatchlistChangePresentationModel extends EchoEventPresentationModel {
public function getPrimaryLink() { public function getPrimaryLink() {
if ( $this->isBundled() ) { if ( $this->isBundled() ) {
return [ return [
'url' => $this->event->getTitle()->getLocalUrl(), 'url' => $this->getEventTitle()->getLocalUrl(),
'label' => $this->msg( 'notification-link-text-view-page' )->text() 'label' => $this->msg( 'notification-link-text-view-page' )->text()
]; ];
} }
@ -103,11 +105,47 @@ class EchoWatchlistChangePresentationModel extends EchoEventPresentationModel {
'logid' => $this->event->getExtraParam( 'logid' ) 'logid' => $this->event->getExtraParam( 'logid' )
] ); ] );
} else { } else {
$url = $this->event->getTitle()->getLocalURL( [ $url = $this->getEventTitle()->getLocalURL( [
'oldid' => 'prev', 'oldid' => 'prev',
'diff' => $revid 'diff' => $revid
] ); ] );
} }
return $url; return $url;
} }
/**
* Returns Event's Title
* Fixes bug T286192, for the events created before the patch [1] applied here
* [1] - https://gerrit.wikimedia.org/r/c/mediawiki/extensions/Echo/+/736484
* @return Title
*/
private function getEventTitle(): Title {
$title = $this->event->getTitle();
if ( !$title ) {
$pageId = $this->event->getPageId();
if ( $pageId ) {
$dbr = MediaWikiServices::getInstance()
->getDBLoadBalancer()
->getMaintenanceConnectionRef( DB_REPLICA );
$row = $dbr->selectRow(
'archive',
[ 'ar_title', 'ar_namespace' ],
[ 'ar_page_id' => $pageId ],
__METHOD__,
[ 'MAX' => 'ar_id', 'ar_id DESC' ]
);
if ( $row ) {
$title = Title::makeTitleSafe( $row->ar_namespace, $row->ar_title );
}
}
if ( !$title ) {
$title = Title::makeTitleSafe( NS_MAIN, 'UNKNOWN TITLE, SEE THE T286192 BUG FOR DETAILS' );
}
if ( !$title ) {
// The latest chance to return a Title object (paranoid mode on)
$title = Title::newMainPage();
}
}
return $title;
}
} }

7
includes/Model/Event.php
View file

@ -580,6 +580,13 @@ class Event extends AbstractEntity implements Bundleable {
return null; return null;
} }
/**
* @return int|null
*/
public function getPageId(): ?int {
return $this->pageId;
}
/** /**
* @return RevisionRecord|null * @return RevisionRecord|null
*/ */