Merge "Get better error message for duplicate names in MagicWordArray"

[lhc/web/wiklou.git] / includes / libs / rdbms / loadmonitor / LoadMonitor.php

diff --git a/includes/libs/rdbms/loadmonitor/LoadMonitor.php b/includes/libs/rdbms/loadmonitor/LoadMonitor.php
index d4e73c9..fdc5ac8 100644 (file)
--- a/includes/libs/rdbms/loadmonitor/LoadMonitor.php
+++ b/includes/libs/rdbms/loadmonitor/LoadMonitor.php
@@ -146,7 +146,7 @@ class LoadMonitor implements ILoadMonitor {
                        if ( $conn ) {
                                $close = false; // already open
                        } else {
-                               $conn = $this->parent->openConnection( $i, $domain );
+                               $conn = $this->parent->openConnection( $i, '' );
                                $close = true; // new connection
                        }
 
@@ -205,7 +205,7 @@ class LoadMonitor implements ILoadMonitor {
        }
 
        /**
-        * @param integer $index Server index
+        * @param int $index Server index
         * @param IDatabase|null $conn Connection handle or null on connection failure
         * @return float
         */