From 04b22818bf7c9585c7c2bb05d2492ef56354f4a0 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Wed, 18 Mar 2009 05:17:49 +0000 Subject: [PATCH] Follow up to r48379, move getSlaveDB() and getMasterDB() up a level too. --- includes/filerepo/FileRepo.php | 8 ++++++++ includes/filerepo/LocalRepo.php | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php index 6332d3a01d..face161487 100644 --- a/includes/filerepo/FileRepo.php +++ b/includes/filerepo/FileRepo.php @@ -590,4 +590,12 @@ abstract class FileRepo { } return wfMsg( 'shared-repo' ); } + + function getSlaveDB() { + return wfGetDB( DB_SLAVE ); + } + + function getMasterDB() { + return wfGetDB( DB_MASTER ); + } } diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php index 25f9092e10..1ec1b9a614 100644 --- a/includes/filerepo/LocalRepo.php +++ b/includes/filerepo/LocalRepo.php @@ -10,14 +10,6 @@ class LocalRepo extends FSRepo { var $fileFromRowFactory = array( 'LocalFile', 'newFromRow' ); var $oldFileFromRowFactory = array( 'OldLocalFile', 'newFromRow' ); - function getSlaveDB() { - return wfGetDB( DB_SLAVE ); - } - - function getMasterDB() { - return wfGetDB( DB_MASTER ); - } - function getMemcKey( $key ) { return wfWikiID( $this->getSlaveDB() ) . ":{$key}"; } -- 2.20.1