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 /includes/ExternalStoreDB.php | |
| parent | 27cf83d177256813e2e802241085fce5dd0f3fb9 (diff) | |
Update to MediaWiki 1.19.0
Diffstat (limited to 'includes/ExternalStoreDB.php')
| -rw-r--r-- | includes/ExternalStoreDB.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/ExternalStoreDB.php b/includes/ExternalStoreDB.php index 552c3109..4920a91c 100644 --- a/includes/ExternalStoreDB.php +++ b/includes/ExternalStoreDB.php @@ -34,7 +34,7 @@ class ExternalStoreDB { $wiki = isset($this->mParams['wiki']) ? $this->mParams['wiki'] : false; $lb =& $this->getLoadBalancer( $cluster ); - if ( !in_array( "DB://" . $cluster, $wgDefaultExternalStore ) ) { + if ( !in_array( "DB://" . $cluster, (array)$wgDefaultExternalStore ) ) { wfDebug( "read only external store" ); $lb->allowLagged(true); } else { @@ -120,12 +120,12 @@ class ExternalStoreDB { wfDebug( "ExternalStoreDB::fetchBlob cache miss on $cacheID\n" ); $dbr =& $this->getSlave( $cluster ); - $ret = $dbr->selectField( $this->getTable( $dbr ), 'blob_text', array( 'blob_id' => $id ) ); + $ret = $dbr->selectField( $this->getTable( $dbr ), 'blob_text', array( 'blob_id' => $id ), __METHOD__ ); if ( $ret === false ) { wfDebugLog( 'ExternalStoreDB', "ExternalStoreDB::fetchBlob master fallback on $cacheID\n" ); // Try the master $dbw =& $this->getMaster( $cluster ); - $ret = $dbw->selectField( $this->getTable( $dbw ), 'blob_text', array( 'blob_id' => $id ) ); + $ret = $dbw->selectField( $this->getTable( $dbw ), 'blob_text', array( 'blob_id' => $id ), __METHOD__ ); if( $ret === false) { wfDebugLog( 'ExternalStoreDB', "ExternalStoreDB::fetchBlob master failed to find $cacheID\n" ); } |