Gergő Tisza has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/336861 )
Change subject: Handle non-existing wikis more gracefully
......................................................................
Handle non-existing wikis more gracefully
Log an error and skip when there are non-existing wikis in the
local* tables (this can easily happen when a wiki is removed).
Bug: T157636
Change-Id: Ibbecdedda5560eb70b2c85bb06db0078dd1556fe
---
M includes/CentralAuthUser.php
M includes/specials/SpecialGlobalRenameProgress.php
2 files changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/61/336861/1
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
index 208e1ee..222c605 100644
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -2031,6 +2031,12 @@
$dbs = array();
foreach ( $result as $row ) {
+ if ( !WikiMap::getWiki( $row->ln_wiki ) ) {
+ LoggerFactory::getInstance( 'CentralAuth'
)->warning( __METHOD__ . ': invalid wiki: '
+ . $row->ln_wiki );
+ continue;
+ }
+
/** @var $row object */
$dbs[] = $row->ln_wiki;
}
@@ -2305,6 +2311,12 @@
$wikis = array();
foreach ( $result as $row ) {
+ if ( !WikiMap::getWiki( $row->lu_wiki ) ) {
+ LoggerFactory::getInstance( 'CentralAuth'
)->warning( __METHOD__ . ': invalid wiki: '
+ . $row->lu_wiki );
+ continue;
+ }
+
/** @var $row object */
$wikis[$row->lu_wiki] = array(
'wiki' => $row->lu_wiki,
diff --git a/includes/specials/SpecialGlobalRenameProgress.php
b/includes/specials/SpecialGlobalRenameProgress.php
index 690beb0..e35d93e 100644
--- a/includes/specials/SpecialGlobalRenameProgress.php
+++ b/includes/specials/SpecialGlobalRenameProgress.php
@@ -1,5 +1,7 @@
<?php
+use MediaWiki\Logger\LoggerFactory;
+
class SpecialGlobalRenameProgress extends FormSpecialPage {
/**
* @var GlobalRenameUserStatus
@@ -140,6 +142,8 @@
foreach( $statuses as $wiki => $status ) {
$wikiReference = WikiMap::getWiki( $wiki );
if ( !$wikiReference ) {
+ LoggerFactory::getInstance( 'CentralAuth'
)->warning( __METHOD__ . ': invalid wiki: '
+ . $wiki );
continue;
}
--
To view, visit https://gerrit.wikimedia.org/r/336861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbecdedda5560eb70b2c85bb06db0078dd1556fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
