X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialRecentchanges.php;h=56d866ff26144fd017d0d8a749f0d08b23680406;hb=e01fd443887b47c86d5248a4a32eca5e5ed98a97;hp=b2e56742f3281abc8124b41bb37b1aa8ed9a4198;hpb=c62e736f183abc62f9b80fcf2703f1a9d8bd379a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index b2e56742f3..56d866ff26 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -22,6 +22,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
+use Wikimedia\Rdbms\ResultWrapper;
 
 /**
  * A special page that lists last changes made to the wiki
@@ -455,6 +456,21 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 		$panel[] = $form;
 		$panelString = implode( "\n", $panel );
 
+		// Insert a placeholder for RCFilters
+		if ( $this->getUser()->getOption(
+				'rcenhancedfilters',
+				/*default=*/ null,
+				/*ignoreHidden=*/ true
+			)
+		) {
+			$this->getOutput()->addHTML(
+				Html::element(
+					'div',
+					[ 'class' => 'rcfilters-container' ]
+				)
+			);
+		}
+
 		$this->getOutput()->addHTML(
 			Xml::fieldset(
 				$this->msg( 'recentchanges-legend' )->text(),
@@ -532,7 +548,8 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 				/*ignoreHidden=*/ true
 			)
 		) {
-			$out->addModules( 'mediawiki.rcfilters.filters' );
+			$out->addModules( 'mediawiki.rcfilters.filters.ui' );
+			$out->addModuleStyles( 'mediawiki.rcfilters.filters.base.styles' );
 		}
 	}
 
@@ -668,7 +685,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 	function makeOptionsLink( $title, $override, $options, $active = false ) {
 		$params = $override + $options;
 
-		// Bug 36524: false values have be converted to "0" otherwise
+		// T38524: false values have be converted to "0" otherwise
 		// wfArrayToCgi() will omit it them.
 		foreach ( $params as &$value ) {
 			if ( $value === false ) {
@@ -681,7 +698,10 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 			$title = new HtmlArmor( '<strong>' . htmlspecialchars( $title ) . '</strong>' );
 		}
 
-		return $this->getLinkRenderer()->makeKnownLink( $this->getPageTitle(), $title, [], $params );
+		return $this->getLinkRenderer()->makeKnownLink( $this->getPageTitle(), $title, [
+			'data-params' => json_encode( $override ),
+			'data-keys' => implode( ',', array_keys( $override ) ),
+		], $params );
 	}
 
 	/**
@@ -817,9 +837,9 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 
 	function filterOnUserExperienceLevel( &$tables, &$conds, &$join_conds, $opts ) {
 		global $wgLearnerEdits,
-			   $wgExperiencedUserEdits,
-			   $wgLearnerMemberSince,
-			   $wgExperiencedUserMemberSince;
+			$wgExperiencedUserEdits,
+			$wgLearnerMemberSince,
+			$wgExperiencedUserMemberSince;
 
 		$selectedExpLevels = explode( ',', strtolower( $opts['userExpLevel'] ) );
 		// remove values that are not recognized