dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "objectcache: add example use case to WANObjectCache::getMultiCheckKeyTime()"
[lhc/web/wiklou.git]
/
includes
/
MovePage.php
diff --git
a/includes/MovePage.php
b/includes/MovePage.php
index
8d0c33d
..
fe82465
100644
(file)
--- 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',
# 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'
[ 'pr_page' => $pageid ],
__METHOD__,
'FOR UPDATE'
@@
-442,7
+442,6
@@
class MovePage {
private function moveToInternal( User $user, &$nt, $reason = '', $createRedirect = true,
array $changeTags = []
) {
private function moveToInternal( User $user, &$nt, $reason = '', $createRedirect = true,
array $changeTags = []
) {
- global $wgContLang;
if ( $nt->exists() ) {
$moveOverRedirect = true;
$logType = 'move_redir';
if ( $nt->exists() ) {
$moveOverRedirect = true;
$logType = 'move_redir';
@@
-511,7
+510,7
@@
class MovePage {
$logEntry->setComment( $reason );
$logEntry->setParameters( [
'4::target' => $nt->getPrefixedText(),
$logEntry->setComment( $reason );
$logEntry->setParameters( [
'4::target' => $nt->getPrefixedText(),
- '5::noredir' => $redirectContent ? '0': '1',
+ '5::noredir' => $redirectContent ? '0'
: '1',
] );
$formatter = LogFormatter::newFromEntry( $logEntry );
] );
$formatter = LogFormatter::newFromEntry( $logEntry );
@@
-520,8
+519,6
@@
class MovePage {
if ( $reason ) {
$comment .= wfMessage( 'colon-separator' )->inContentLanguage()->text() . $reason;
}
if ( $reason ) {
$comment .= wfMessage( 'colon-separator' )->inContentLanguage()->text() . $reason;
}
- # Truncate for whole multibyte characters.
- $comment = $wgContLang->truncate( $comment, 255 );
$dbw = wfGetDB( DB_MASTER );
$dbw = wfGetDB( DB_MASTER );