diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
| commit | d9022f63880ce039446fba8364f68e656b7bf4cb (patch) | |
| tree | 16b40fbf17bf7c9ee6f4ead25b16dd192378050a /maintenance/getSlaveServer.php | |
| parent | 27cf83d177256813e2e802241085fce5dd0f3fb9 (diff) | |
Update to MediaWiki 1.19.0
Diffstat (limited to 'maintenance/getSlaveServer.php')
| -rw-r--r-- | maintenance/getSlaveServer.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/maintenance/getSlaveServer.php b/maintenance/getSlaveServer.php index a9d93f1d..3d13bc4e 100644 --- a/maintenance/getSlaveServer.php +++ b/maintenance/getSlaveServer.php @@ -32,15 +32,13 @@ class GetSlaveServer extends Maintenance { global $wgAllDBsAreLocalhost; if ( $wgAllDBsAreLocalhost ) { $host = 'localhost'; + } elseif ( $this->hasOption( 'group' ) ) { + $db = wfGetDB( DB_SLAVE, $this->getOption( 'group' ) ); + $host = $db->getServer(); } else { - if ( $this->hasOption( 'group' ) ) { - $db = wfGetDB( DB_SLAVE, $this->getOption( 'group' ) ); - $host = $db->getServer(); - } else { - $lb = wfGetLB(); - $i = $lb->getReaderIndex(); - $host = $lb->getServerName( $i ); - } + $lb = wfGetLB(); + $i = $lb->getReaderIndex(); + $host = $lb->getServerName( $i ); } $this->output( "$host\n" ); } |