Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/250048
Change subject: IDatabase::delete() does not take a fourth parameter
......................................................................
IDatabase::delete() does not take a fourth parameter
And don't use the deprecated getDB() function.
Change-Id: I824fb1e69262298d6b76fb22b499d961c1189f98
---
M includes/EmailBatch.php
M includes/EmailBundler.php
2 files changed, 4 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/48/250048/1
diff --git a/includes/EmailBatch.php b/includes/EmailBatch.php
index d7d9ab6..a2b184c 100644
--- a/includes/EmailBatch.php
+++ b/includes/EmailBatch.php
@@ -226,12 +226,11 @@
$conds[] = 'eeb_event_id <= ' . intval(
$this->lastEvent );
}
- $dbw = MWEchoDbFactory::getDB( DB_MASTER );
+ $dbw = MWEchoDbFactory::newFromDefault()->getEchoDb( DB_MASTER
);
$dbw->delete(
'echo_email_batch',
$conds,
- __METHOD__,
- array()
+ __METHOD__
);
}
diff --git a/includes/EmailBundler.php b/includes/EmailBundler.php
index 22a4389..514f9a7 100644
--- a/includes/EmailBundler.php
+++ b/includes/EmailBundler.php
@@ -298,12 +298,11 @@
$conds[] = 'eeb_event_id <= ' . intval(
$this->baseEvent->getId() );
- $dbw = MWEchoDbFactory::getDB( DB_MASTER );
+ $dbw = MWEchoDbFactory::newFromDefault()->getEchoDb( DB_MASTER
);
$dbw->delete(
'echo_email_batch',
$conds,
- __METHOD__,
- array()
+ __METHOD__
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/250048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I824fb1e69262298d6b76fb22b499d961c1189f98
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
