mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools
synced 2024-11-24 00:13:36 +00:00
Merge "ThreadItemStore: Omit redundant updates to avoid warnings"
This commit is contained in:
commit
797bd2ea0b
|
@ -680,7 +680,11 @@ class ThreadItemStore {
|
||||||
// which are causing conflicts (T339882, T343859#9185559)
|
// which are causing conflicts (T339882, T343859#9185559)
|
||||||
->onDuplicateKeyUpdate()
|
->onDuplicateKeyUpdate()
|
||||||
->uniqueIndexFields( [ 'itr_itemid_id', 'itr_revision_id' ] )
|
->uniqueIndexFields( [ 'itr_itemid_id', 'itr_revision_id' ] )
|
||||||
->set( $newOrUpdateRevRow )
|
// Omit redundant updates to avoid warnings (T353432)
|
||||||
|
->set( array_diff_key(
|
||||||
|
$newOrUpdateRevRow,
|
||||||
|
[ 'itr_itemid_id' => true, 'itr_revision_id' => true ]
|
||||||
|
) )
|
||||||
->caller( $method )
|
->caller( $method )
|
||||||
->execute();
|
->execute();
|
||||||
return $dbw->affectedRows() ? $dbw->insertId() : null;
|
return $dbw->affectedRows() ? $dbw->insertId() : null;
|
||||||
|
|
Loading…
Reference in a new issue