X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMovePage.php;h=fe8246535fcf1b693bdf6709bb6f1f81595615ff;hb=fc23633035eebb24b7199cb15683e25100184e2b;hp=9a83d35705eaf1c62a43604b6ecd3283615f31f9;hpb=3d6e6cd952e640bd112f6871e64772df8b06e6ee;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/MovePage.php b/includes/MovePage.php index 9a83d35705..fe8246535f 100644 --- a/includes/MovePage.php +++ b/includes/MovePage.php @@ -310,7 +310,7 @@ class MovePage { # Protect the redirect title as the title used to be... $res = $dbw->select( 'page_restrictions', - '*', + [ 'pr_type', 'pr_level', 'pr_cascade', 'pr_user', 'pr_expiry' ], [ 'pr_page' => $pageid ], __METHOD__, 'FOR UPDATE' @@ -440,9 +440,8 @@ class MovePage { * @throws MWException */ private function moveToInternal( User $user, &$nt, $reason = '', $createRedirect = true, - array $changeTags = [] ) { - - global $wgContLang; + array $changeTags = [] + ) { if ( $nt->exists() ) { $moveOverRedirect = true; $logType = 'move_redir'; @@ -455,7 +454,7 @@ class MovePage { $overwriteMessage = wfMessage( 'delete_and_move_reason', $this->oldTitle->getPrefixedText() - )->text(); + )->inContentLanguage()->text(); $newpage = WikiPage::factory( $nt ); $errs = []; $status = $newpage->doDeleteArticleReal( @@ -511,7 +510,7 @@ class MovePage { $logEntry->setComment( $reason ); $logEntry->setParameters( [ '4::target' => $nt->getPrefixedText(), - '5::noredir' => $redirectContent ? '0': '1', + '5::noredir' => $redirectContent ? '0' : '1', ] ); $formatter = LogFormatter::newFromEntry( $logEntry ); @@ -520,8 +519,6 @@ class MovePage { if ( $reason ) { $comment .= wfMessage( 'colon-separator' )->inContentLanguage()->text() . $reason; } - # Truncate for whole multibyte characters. - $comment = $wgContLang->truncate( $comment, 255 ); $dbw = wfGetDB( DB_MASTER );