Merge "Revert "Use display name in category page subheadings if provided""

[lhc/web/wiklou.git] / maintenance / userOptions.inc

diff --git a/maintenance/userOptions.inc b/maintenance/userOptions.inc
index f4ffbd0..c657c03 100644 (file)
--- a/maintenance/userOptions.inc
+++ b/maintenance/userOptions.inc
@@ -22,8 +22,8 @@
  */
 
 // Options we will use
-$options = array( 'list', 'nowarn', 'quiet', 'usage', 'dry' );
-$optionsWithArgs = array( 'old', 'new' );
+$options = [ 'list', 'nowarn', 'quiet', 'usage', 'dry' ];
+$optionsWithArgs = [ 'old', 'new' ];
 
 require_once __DIR__ . '/commandLine.inc';
 
@@ -137,14 +137,14 @@ class UserOptions {
         * List options usage
         */
        private function USAGER() {
-               $ret = array();
+               $ret = [];
                $defaultOptions = User::getDefaultOptions();
 
-               // We list user by user_id from one of the slave database
-               $dbr = wfGetDB( DB_SLAVE );
+               // We list user by user_id from one of the replica DBs
+               $dbr = wfGetDB( DB_REPLICA );
                $result = $dbr->select( 'user',
-                       array( 'user_id' ),
-                       array(),
+                       [ 'user_id' ],
+                       [],
                        __METHOD__
                );
 
@@ -194,11 +194,11 @@ class UserOptions {
        private function CHANGER() {
                $this->warn();
 
-               // We list user by user_id from one of the slave database
-               $dbr = wfGetDB( DB_SLAVE );
+               // We list user by user_id from one of the replica DBs
+               $dbr = wfGetDB( DB_REPLICA );
                $result = $dbr->select( 'user',
-                       array( 'user_id' ),
-                       array(),
+                       [ 'user_id' ],
+                       [],
                        __METHOD__
                );
 
@@ -238,7 +238,7 @@ class UserOptions {
         */
        public static function getDefaultOptionsNames() {
                $def = User::getDefaultOptions();
-               $ret = array();
+               $ret = [];
                foreach ( $def as $optname => $defaultValue ) {
                        array_push( $ret, $optname );
                }