Merge "Use PHP 7 '??' operator instead of '?:' with 'isset()' where convenient"

diff --cc includes/GlobalFunctions.php
Simple merge

diff --cc includes/libs/rdbms/loadbalancer/LoadBalancer.php
index d5195ef,75f8845..221bca4
--- 1/includes/libs/rdbms/loadbalancer/LoadBalancer.php
--- 2/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@@ -1195,16 -1183,8 +1183,16 @@@ class LoadBalancer implements ILoadBala
                return ( $name != '' ) ? $name : 'localhost';
        }
  
 +      public function getServerInfo( $i ) {
 +              if ( isset( $this->servers[$i] ) ) {
 +                      return $this->servers[$i];
 +              } else {
 +                      return false;
 +              }
 +      }
 +
        public function getServerType( $i ) {
-               return isset( $this->servers[$i]['type'] ) ? $this->servers[$i]['type'] : 'unknown';
+               return $this->servers[$i]['type'] ?? 'unknown';
        }
  
        public function getMasterPos() {

diff --cc includes/session/PHPSessionHandler.php
Simple merge