X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FFileDeleteForm.php;h=f284d924a06e4e395dd84f7b0bade6bdc3d82508;hb=97a8fb78faa4ca2d9604140e5547f5deae5a2524;hp=e6223e81b84e9993cd07fb8e3b6207f42d352c00;hpb=afb713a1fa51bb194d4ffac2d495796c0030fc14;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index e6223e81b8..f284d924a0 100644
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -21,6 +21,7 @@
  * @author Rob Church <robchur@gmail.com>
  * @ingroup Media
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * File deletion user interface
@@ -152,7 +153,7 @@ class FileDeleteForm {
 	 * @param User $user User object performing the request
 	 * @param array $tags Tags to apply to the deletion action
 	 * @throws MWException
-	 * @return bool|Status
+	 * @return Status
 	 */
 	public static function doDelete( &$title, &$file, &$oldimage, $reason,
 		$suppress, User $user = null, $tags = []
@@ -205,7 +206,8 @@ class FileDeleteForm {
 					$dbw->endAtomic( __METHOD__ );
 				} else {
 					// Page deleted but file still there? rollback page delete
-					wfGetLBFactory()->rollbackMasterChanges( __METHOD__ );
+					$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+					$lbFactory->rollbackMasterChanges( __METHOD__ );
 				}
 			} else {
 				// Done; nothing changed
@@ -301,9 +303,10 @@ class FileDeleteForm {
 
 			if ( $wgUser->isAllowed( 'editinterface' ) ) {
 				$title = wfMessage( 'filedelete-reason-dropdown' )->inContentLanguage()->getTitle();
-				$link = Linker::linkKnown(
+				$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+				$link = $linkRenderer->makeKnownLink(
 					$title,
-					wfMessage( 'filedelete-edit-reasonlist' )->escaped(),
+					wfMessage( 'filedelete-edit-reasonlist' )->text(),
 					[],
 					[ 'action' => 'edit' ]
 				);