* Introduced LBFactory -- an abstract class for configuring database load balancers...

[lhc/web/wiklou.git] / includes / UserRightsProxy.php

diff --git a/includes/UserRightsProxy.php b/includes/UserRightsProxy.php
index 1e1684a..9096744 100644 (file)
--- a/includes/UserRightsProxy.php
+++ b/includes/UserRightsProxy.php
@@ -72,25 +72,12 @@ class UserRightsProxy {
                                // Hmm... this shouldn't happen though. :)
                                return wfGetDB( DB_MASTER );
                        } else {
-                               global $wgDBuser, $wgDBpassword;
-                               $server = self::getMaster( $database );
-                               return new Database( $server, $wgDBuser, $wgDBpassword, $database );
+                               return wfGetDB( DB_MASTER, array(), $database );
                        }
                }
                return null;
        }
        
-       /**
-        * Return the master server to connect to for the requested database.
-        */
-       private static function getMaster( $database ) {
-               global $wgDBserver, $wgAlternateMaster;
-               if( isset( $wgAlternateMaster[$database] ) ) {
-                       return $wgAlternateMaster[$database];
-               }
-               return $wgDBserver;
-       }
-       
        public function getId() {
                return $this->id;
        }
@@ -158,4 +145,4 @@ class UserRightsProxy {
        }
 }
 
-?>
\ No newline at end of file
+?>