X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMediaWiki.php;h=990ed4e3580310c31223fd5e2fb60a551d56ffcc;hb=2d382b198ff45f5e4cd64792cc954cd138552981;hp=43512e122367010d42649cd6f8ae7438935a7002;hpb=70d84f29a426b24ea36ee9c40f4b8cdf2c540859;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 43512e1223..990ed4e358 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -330,7 +330,7 @@ class MediaWiki {
 
 		if ( $request->getVal( 'action', 'view' ) != 'view'
 			|| $request->wasPosted()
-			|| ( $request->getVal( 'title' ) !== null
+			|| ( $request->getCheck( 'title' )
 				&& $title->getPrefixedDBkey() == $request->getVal( 'title' ) )
 			|| count( $request->getValueNames( [ 'action', 'title' ] ) )
 			|| !Hooks::run( 'TestCanonicalRedirect', [ $request, $title, $output ] )
@@ -428,11 +428,9 @@ class MediaWiki {
 			if ( !$ignoreRedirect && ( $target || $page->isRedirect() ) ) {
 				// Is the target already set by an extension?
 				$target = $target ?: $page->followRedirect();
-				if ( is_string( $target ) ) {
-					if ( !$this->config->get( 'DisableHardRedirects' ) ) {
-						// we'll need to redirect
-						return $target;
-					}
+				if ( is_string( $target ) && !$this->config->get( 'DisableHardRedirects' ) ) {
+					// we'll need to redirect
+					return $target;
 				}
 				if ( is_object( $target ) ) {
 					// Rewrite environment to redirected article
@@ -937,7 +935,7 @@ class MediaWiki {
 	) {
 		if ( $config->get( 'StatsdServer' ) && $stats->hasData() ) {
 			try {
-				$statsdServer = explode( ':', $config->get( 'StatsdServer' ) );
+				$statsdServer = explode( ':', $config->get( 'StatsdServer' ), 2 );
 				$statsdHost = $statsdServer[0];
 				$statsdPort = $statsdServer[1] ?? 8125;
 				$statsdSender = new SocketSender( $statsdHost, $statsdPort );