mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/LoginNotify
synced 2024-11-28 08:50:17 +00:00
Merge "Use accurate count when budling multiple login failure warnings"
This commit is contained in:
commit
ea51bb44f5
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
namespace LoginNotify;
|
namespace LoginNotify;
|
||||||
|
|
||||||
|
use EchoEvent;
|
||||||
use EchoEventPresentationModel;
|
use EchoEventPresentationModel;
|
||||||
use Message;
|
use Message;
|
||||||
use SpecialPage;
|
use SpecialPage;
|
||||||
|
@ -67,7 +68,10 @@ class PresentationModel extends EchoEventPresentationModel {
|
||||||
// If it's a bundle, pass it the bundle count as param
|
// If it's a bundle, pass it the bundle count as param
|
||||||
if ( $this->isBundled() ) {
|
if ( $this->isBundled() ) {
|
||||||
$msg = $this->msg( 'notification-new-bundled-header-login-fail' );
|
$msg = $this->msg( 'notification-new-bundled-header-login-fail' );
|
||||||
$msg->params( $this->getBundleCount() );
|
$totalAttempts = array_reduce( $this->getBundledEvents(), function ( $sum, EchoEvent $event ) {
|
||||||
|
return $sum + $event->getExtraParam( 'count', 0 );
|
||||||
|
}, 0 );
|
||||||
|
$msg->params( $totalAttempts );
|
||||||
} else {
|
} else {
|
||||||
// If the bundle is read or user goes to Special:Notifications, show
|
// If the bundle is read or user goes to Special:Notifications, show
|
||||||
// one notification per attempt (aligned with how unbundled bundles work)
|
// one notification per attempt (aligned with how unbundled bundles work)
|
||||||
|
@ -97,4 +101,5 @@ class PresentationModel extends EchoEventPresentationModel {
|
||||||
|
|
||||||
return [ $changePasswordLink ];
|
return [ $changePasswordLink ];
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue