Some cleanup :

* DB_READ -> DB_SLAVE
* DB_WRITE -> DB_MASTER

diff --git a/includes/SpecialWhatlinkshere.php b/includes/SpecialWhatlinkshere.php
index 16a44ee..f89cdcc 100644 (file)
--- a/includes/SpecialWhatlinkshere.php
+++ b/includes/SpecialWhatlinkshere.php
@@ -76,7 +76,7 @@ class WhatLinksHerePage {
        function showIndirectLinks( $level, $target, $limit, $from = 0, $back = 0 ) {
                global $wgOut;
                $fname = 'WhatLinksHerePage::showIndirectLinks';
-               $dbr = wfGetDB( DB_READ );
+               $dbr = wfGetDB( DB_SLAVE );
                $options = array();
 
                $ns = $this->request->getIntOrNull( 'namespace' );

diff --git a/maintenance/addwiki.php b/maintenance/addwiki.php
index a19b24c..fc3b501 100644 (file)
--- a/maintenance/addwiki.php
+++ b/maintenance/addwiki.php
@@ -19,7 +19,7 @@ function addWiki( $lang, $site, $dbName )
 
        $name = $wgLanguageNames[$lang];
 
-       $dbw = wfGetDB( DB_WRITE );
+       $dbw = wfGetDB( DB_MASTER );
        $common = "/home/wikipedia/common";
        $maintenance = "$IP/maintenance";
 

diff --git a/maintenance/parserTests.inc b/maintenance/parserTests.inc
index 73a1584..00b1fe1 100644 (file)
--- a/maintenance/parserTests.inc
+++ b/maintenance/parserTests.inc
@@ -353,7 +353,7 @@ class ParserTest {
         */
        private function setupGlobals($opts = '') {
                # Save the prefixed / quoted table names for later use when we make the temporaries.
-               $db = wfGetDB( DB_READ );
+               $db = wfGetDB( DB_SLAVE );
                $this->oldTableNames = array();
                foreach( $this->listTables() as $table ) {
                        $this->oldTableNames[$table] = $db->tableName( $table );

diff --git a/maintenance/refreshLinks.inc b/maintenance/refreshLinks.inc
index c471d0e..70e2a5d 100644 (file)
--- a/maintenance/refreshLinks.inc
+++ b/maintenance/refreshLinks.inc
@@ -142,7 +142,7 @@ function deleteLinksFromNonexistent( $maxLag = 0 ) {
 
        wfWaitForSlaves( $maxLag );
 
-       $dbw = wfGetDB( DB_WRITE );
+       $dbw = wfGetDB( DB_MASTER );
 
        $linksTables = array(
                'pagelinks' => 'pl_from',