X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fdb%2FLBFactoryMulti.php;h=bac96523422d805416c79de065fafa507c505a61;hb=81041728520a8eb72df2dab422aa35e0052e71b0;hp=3c1885f1bc16d9b6a8abce3f045341c1f71888cb;hpb=807d510ad7353ae4adee736eb6f4b34890761114;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/db/LBFactoryMulti.php b/includes/db/LBFactoryMulti.php index 3c1885f1bc..bac9652342 100644 --- a/includes/db/LBFactoryMulti.php +++ b/includes/db/LBFactoryMulti.php @@ -263,7 +263,7 @@ class LBFactoryMulti extends LBFactory { } /** - * @param string $cluster external storage cluster, or false for core + * @param string $cluster External storage cluster, or false for core * @param bool|string $wiki Wiki ID, or false for the current wiki * @return LoadBalancer */ @@ -286,11 +286,9 @@ class LBFactoryMulti extends LBFactory { * @return LoadBalancer */ function newLoadBalancer( $template, $loads, $groupLoads ) { - global $wgMasterWaitTimeout; $servers = $this->makeServerArray( $template, $loads, $groupLoads ); $lb = new LoadBalancer( array( 'servers' => $servers, - 'masterWaitTimeout' => $wgMasterWaitTimeout ) ); return $lb;