From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 15 Aug 2016 12:14:04 +0000 (-0700)
Subject: Always set DBO_DEFAULT by default for LBFactory classes for consistency
X-Git-Tag: 1.31.0-rc.0~6041^2
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=7cd7785af7e69442fc4e8f1b0846e8435c802ede;p=lhc%2Fweb%2Fwiklou.git

Always set DBO_DEFAULT by default for LBFactory classes for consistency

Before, only the non $wgDBservers case did this in LBFactorySimple

Change-Id: If1a962663d5e23b2087873f86efe40a1166f96a7
---

diff --git a/includes/db/loadbalancer/LBFactoryMulti.php b/includes/db/loadbalancer/LBFactoryMulti.php
index 0f3ca932a9..4b9cccc86a 100644
--- a/includes/db/loadbalancer/LBFactoryMulti.php
+++ b/includes/db/loadbalancer/LBFactoryMulti.php
@@ -364,6 +364,8 @@ class LBFactoryMulti extends LBFactory {
 			}
 			$serverInfo['hostName'] = $serverName;
 			$serverInfo['load'] = $load;
+			$serverInfo += [ 'flags' => DBO_DEFAULT ];
+
 			$servers[] = $serverInfo;
 		}
 
diff --git a/includes/db/loadbalancer/LBFactorySimple.php b/includes/db/loadbalancer/LBFactorySimple.php
index 14baf2e7b0..3702c8b05d 100644
--- a/includes/db/loadbalancer/LBFactorySimple.php
+++ b/includes/db/loadbalancer/LBFactorySimple.php
@@ -56,6 +56,7 @@ class LBFactorySimple extends LBFactory {
 				} else {
 					$server['slave'] = true;
 				}
+				$server += [ 'flags' => DBO_DEFAULT ];
 			}
 		} else {
 			global $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, $wgDBtype, $wgDebugDumpSql;