Check expiry and add missing return statement

femiwiki · Sep 21, 2024 · 52b96d3 · 52b96d3
1 parent 7c8e46e
commit 52b96d3
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/includes/HookHandlers/SpamEmail.php b/includes/HookHandlers/SpamEmail.php
@@ -66,6 +66,9 @@ public function onIsValidEmailAddr( $addr, &$result ) {
 		// Check email addresses of block users
 		$emails = array_filter( array_unique( array_map(
 			static function ( $block ) {
+				if ( wfTimestampNow() > $block->getExpiry() ) {
+					return null;
+				}
 				$id = $block->getBlocker();
 				if ( $id ) {
 					return User::newFromIdentity( $id )->getEmail();
@@ -78,5 +81,6 @@ static function ( $block ) {
 			$result = false;
 			return false;
 		}
+		return true;
 	}
 }