Merge "Make the filter field on ViewHistory of "int" type"

includes/AbuseFilter.php

@@ -352,7 +352,7 @@ class AbuseFilter {
 	}
 
 	/**
-	 * @param string $filter
+	 * @param string|int $filter
 	 * @return bool
 	 */
 	public static function filterHidden( $filter ) {
@@ -809,7 +809,7 @@ class AbuseFilter {
 	/**
 	 * Utility function to decode "<GLOBAL_FILTER_PREFIX>$index" to $index. Returns false if not global
 	 *
-	 * @param string $filter
+	 * @param string|int $filter
 	 *
 	 * @return string|bool
 	 */

includes/Views/AbuseFilterViewHistory.php

@@ -18,7 +18,7 @@ class AbuseFilterViewHistory extends AbuseFilterView {
 		$out->enableOOUI();
 		$filter = $this->getRequest()->getText( 'filter' ) ?: $this->mFilter;
 		// Ensure the parameter is a valid filter ID
-		$filter = preg_match( '/^[1-9][0-9]*$/', (string)$filter ) === 0 ? null : (int)$filter;
+		$filter = (int)$filter;
 
 		if ( $filter ) {
 			$out->setPageTitle( $this->msg( 'abusefilter-history' )->numParams( $filter ) );
@@ -77,7 +77,7 @@ class AbuseFilterViewHistory extends AbuseFilterView {
 				'label-message' => 'abusefilter-history-select-user'
 			],
 			'filter' => [
-				'type' => 'text',
+				'type' => 'int',
 				'name' => 'filter',
 				'default' => $filter,
 				'size' => '45',

includes/pagers/AbuseFilterHistoryPager.php

@@ -7,7 +7,7 @@ class AbuseFilterHistoryPager extends TablePager {
 
 	protected $linkRenderer;
 	/**
-	 * @param string $filter
+	 * @param int $filter
 	 * @param AbuseFilterViewHistory $page
 	 * @param string $user User name
 	 * @param LinkRenderer $linkRenderer

includes/special/SpecialAbuseLog.php

@@ -853,7 +853,7 @@ class SpecialAbuseLog extends SpecialPage {
 	}
 
 	/**
-	 * @param string|null $filter_id
+	 * @param string|int|null $filter_id
 	 * @param bool|int|null $filter_hidden
 	 * @return bool
 	 */