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 "Convert Special:DeletedContributions to use OOUI."
[lhc/web/wiklou.git]
/
includes
/
deferred
/
MWCallableUpdate.php
diff --git
a/includes/deferred/MWCallableUpdate.php
b/includes/deferred/MWCallableUpdate.php
index
d63c292
..
5247e97
100644
(file)
--- a/
includes/deferred/MWCallableUpdate.php
+++ b/
includes/deferred/MWCallableUpdate.php
@@
-4,7
+4,7
@@
* Deferrable Update for closure/callback
*/
class MWCallableUpdate implements DeferrableUpdate, DeferrableCallback {
* Deferrable Update for closure/callback
*/
class MWCallableUpdate implements DeferrableUpdate, DeferrableCallback {
- /** @var callable */
+ /** @var callable
|null
*/
private $callback;
/** @var string */
private $fname;
private $callback;
/** @var string */
private $fname;
@@
-12,14
+12,27
@@
class MWCallableUpdate implements DeferrableUpdate, DeferrableCallback {
/**
* @param callable $callback
* @param string $fname Calling method
/**
* @param callable $callback
* @param string $fname Calling method
+ * @param IDatabase|null $dbw Abort if this DB is rolled back [optional] (since 1.28)
*/
*/
- public function __construct( callable $callback, $fname = 'unknown' ) {
+ public function __construct( callable $callback, $fname = 'unknown'
, IDatabase $dbw = null
) {
$this->callback = $callback;
$this->fname = $fname;
$this->callback = $callback;
$this->fname = $fname;
+
+ if ( $dbw && $dbw->trxLevel() ) {
+ $dbw->onTransactionResolution( [ $this, 'cancelOnRollback' ], $fname );
+ }
}
public function doUpdate() {
}
public function doUpdate() {
- call_user_func( $this->callback );
+ if ( $this->callback ) {
+ call_user_func( $this->callback );
+ }
+ }
+
+ public function cancelOnRollback( $trigger ) {
+ if ( $trigger === IDatabase::TRIGGER_ROLLBACK ) {
+ $this->callback = null;
+ }
}
public function getOrigin() {
}
public function getOrigin() {