Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198235
Change subject: Check for the return on insert and update instead of relying on
modified rows. Rows updated with no change result in erroneous error messages.
......................................................................
Check for the return on insert and update instead of relying on modified rows.
Rows updated with no change result in erroneous error messages.
Change-Id: I9611c9e3d666f824bf762d493b4a6479a9ef5f41
---
M Interwiki_body.php
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Interwiki
refs/changes/35/198235/1
diff --git a/Interwiki_body.php b/Interwiki_body.php
index 0070cfb..510dbe9 100644
--- a/Interwiki_body.php
+++ b/Interwiki_body.php
@@ -274,14 +274,15 @@
return;
}
+ $success = true;
if ( $do === 'add' ) {
- $dbw->insert( 'interwiki', $data, __METHOD__,
'IGNORE' );
+ $success = $dbw->insert( 'interwiki', $data,
__METHOD__, 'IGNORE' );
} else { // $do === 'edit'
- $dbw->update( 'interwiki', $data, array(
'iw_prefix' => $prefix ), __METHOD__, 'IGNORE' );
+ $success = $dbw->update( 'interwiki', $data,
array( 'iw_prefix' => $prefix ), __METHOD__, 'IGNORE' );
}
// used here: interwiki_addfailed, interwiki_added,
interwiki_edited
- if ( $dbw->affectedRows() === 0 ) {
+ if ( $dbw->affectedRows() === 0 && !$success ) {
$this->error( "interwiki_{$do}failed", $prefix
);
$this->showForm( $do );
} else {
--
To view, visit https://gerrit.wikimedia.org/r/198235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9611c9e3d666f824bf762d493b4a6479a9ef5f41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Interwiki
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <[email protected]>
Gerrit-Reviewer: Alexia <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
