X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecialpage%2FChangesListSpecialPage.php;h=282d7642399835a362b71fdc156776467570de30;hb=58858df842f91d9ea1c9f9b6f3c767d8b204886b;hp=b6d1028778aba95718168f7b7d9a39cf970d7d72;hpb=6bd1e23f4a281b05e6c171653a715c394aac36d6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index b6d1028778..282d764239 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -553,7 +553,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 	public function execute( $subpage ) {
 		$this->rcSubpage = $subpage;
 
-		$this->considerActionsForDefaultSavedQuery();
+		$this->considerActionsForDefaultSavedQuery( $subpage );
 
 		$opts = $this->getOptions();
 		try {
@@ -570,8 +570,15 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 			// Used by "live update" and "view newest" to check
 			// if there's new changes with minimal data transfer
 			if ( $this->getRequest()->getBool( 'peek' ) ) {
-			$code = $rows->numRows() > 0 ? 200 : 204;
+				$code = $rows->numRows() > 0 ? 200 : 204;
 				$this->getOutput()->setStatusCode( $code );
+
+				if ( $this->getUser()->isAnon() !==
+					$this->getRequest()->getFuzzyBool( 'isAnon' )
+				) {
+					$this->getOutput()->setStatusCode( 205 );
+				}
+
 				return;
 			}
 
@@ -622,9 +629,11 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 	 * Check whether or not the page should load defaults, and if so, whether
 	 * a default saved query is relevant to be redirected to. If it is relevant,
 	 * redirect properly with all necessary query parameters.
+	 *
+	 * @param string $subpage
 	 */
-	protected function considerActionsForDefaultSavedQuery() {
-		if ( !$this->isStructuredFilterUiEnabled() ) {
+	protected function considerActionsForDefaultSavedQuery( $subpage ) {
+		if ( !$this->isStructuredFilterUiEnabled() || $this->including() ) {
 			return;
 		}
 
@@ -670,7 +679,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 					// but are still valid and requested in the URL
 					$query = array_merge( $this->getRequest()->getValues(), $query );
 					unset( $query[ 'title' ] );
-					$this->getOutput()->redirect( $this->getPageTitle()->getCanonicalURL( $query ) );
+					$this->getOutput()->redirect( $this->getPageTitle( $subpage )->getCanonicalURL( $query ) );
 				} else {
 					// There's a default, but the version is not 2, and the server can't
 					// actually recognize the query itself. This happens if it is before
@@ -697,7 +706,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 	 */
 	protected function includeRcFiltersApp() {
 		$out = $this->getOutput();
-		if ( $this->isStructuredFilterUiEnabled() ) {
+		if ( $this->isStructuredFilterUiEnabled() && !$this->including() ) {
 			$jsData = $this->getStructuredFilterJsData();
 
 			$messages = [];
@@ -1642,7 +1651,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 		] );
 		$out->addModules( 'mediawiki.special.changeslist.legend.js' );
 
-		if ( $this->isStructuredFilterUiEnabled() ) {
+		if ( $this->isStructuredFilterUiEnabled() && !$this->including() ) {
 			$out->addModules( 'mediawiki.rcfilters.filters.ui' );
 			$out->addModuleStyles( 'mediawiki.rcfilters.filters.base.styles' );
 		}
@@ -1803,7 +1812,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 	 *
 	 * @since 1.31
 	 * @param Config $config
-	 * @param User $user User object
+	 * @param User $user
 	 * @return bool
 	 */
 	public static function checkStructuredFilterUiEnabled( Config $config, User $user ) {