dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "Improve safeGetLag() return docs"
[lhc/web/wiklou.git]
/
includes
/
db
/
loadbalancer
/
LoadBalancer.php
diff --git
a/includes/db/loadbalancer/LoadBalancer.php
b/includes/db/loadbalancer/LoadBalancer.php
index
b029a1d
..
7199389
100644
(file)
--- a/
includes/db/loadbalancer/LoadBalancer.php
+++ b/
includes/db/loadbalancer/LoadBalancer.php
@@
-1391,6
+1391,9
@@
class LoadBalancer {
}
$pos = $pos ?: $this->getConnection( DB_MASTER )->getMasterPos();
+ if ( !$pos ) {
+ return false; // something is misconfigured
+ }
$result = $conn->masterPosWait( $pos, $timeout );
if ( $result == -1 || is_null( $result ) ) {