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 "Revert "RCFilters: Export config vars in the RL modules where possible""
[lhc/web/wiklou.git]
/
includes
/
MovePage.php
diff --git
a/includes/MovePage.php
b/includes/MovePage.php
index
7d27a27
..
bcec0a1
100644
(file)
--- a/
includes/MovePage.php
+++ b/
includes/MovePage.php
@@
-21,6
+21,7
@@
use MediaWiki\MediaWikiServices;
use MediaWiki\Revision\SlotRecord;
use MediaWiki\MediaWikiServices;
use MediaWiki\Revision\SlotRecord;
+use Wikimedia\Rdbms\IDatabase;
/**
* Handles the backend logic of moving a page from one title
/**
* Handles the backend logic of moving a page from one title
@@
-250,7
+251,7
@@
class MovePage {
}
$dbw = wfGetDB( DB_MASTER );
}
$dbw = wfGetDB( DB_MASTER );
- $dbw->startAtomic( __METHOD__ );
+ $dbw->startAtomic( __METHOD__
, IDatabase::ATOMIC_CANCELABLE
);
Hooks::run( 'TitleMoveStarting', [ $this->oldTitle, $this->newTitle, $user ] );
Hooks::run( 'TitleMoveStarting', [ $this->oldTitle, $this->newTitle, $user ] );
@@
-425,7
+426,7
@@
class MovePage {
* Move a file associated with a page to a new location.
* Can also be used to revert after a DB failure.
*
* Move a file associated with a page to a new location.
* Can also be used to revert after a DB failure.
*
- * @
access
private
+ * @private
* @param Title Old location to move the file from.
* @param Title New location to move the file to.
* @return Status
* @param Title Old location to move the file from.
* @param Title New location to move the file to.
* @return Status
@@
-493,7
+494,8
@@
class MovePage {
);
if ( !$status->isGood() ) {
);
if ( !$status->isGood() ) {
- throw new MWException( 'Failed to delete page-move revision: ' . $status );
+ throw new MWException( 'Failed to delete page-move revision: '
+ . $status->getWikiText( false, false, 'en' ) );
}
$nt->resetArticleID( false );
}
$nt->resetArticleID( false );