Merge "Make variant selection menu toggleable by keyboard"

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

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index 332527b..be07142 100644 (file)
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -1,12 +1,31 @@
 <?php
-
 /**
- * Backwards-compatibility wrapper for old-style maintenance scripts
+ * Backwards-compatibility wrapper for old-style maintenance scripts.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Maintenance
  */
-require( dirname(__FILE__) . '/Maintenance.php' );
 
+require_once __DIR__ . '/Maintenance.php';
+
+global $optionsWithArgs;
 if ( !isset( $optionsWithArgs ) ) {
-    $optionsWithArgs = array();
+       $optionsWithArgs = array();
 }
 
 class CommandLineInc extends Maintenance {
@@ -18,19 +37,13 @@ class CommandLineInc extends Maintenance {
                }
        }
 
-       public function getDbType() {
-               global $wgUseNormalUser;
-
-               return ( isset( $wgUseNormalUser ) && $wgUseNormalUser ) ?
-                       Maintenance::DB_STD : Maintenance::DB_ADMIN;
-       }
-
        /**
         * No help, it would just be misleading since it misses custom options
         */
        protected function maybeHelp( $force = false ) {
-               if ( !$force )
+               if ( !$force ) {
                        return;
+               }
                parent::maybeHelp( true );
        }
 
@@ -42,5 +55,5 @@ class CommandLineInc extends Maintenance {
 }
 
 $maintClass = 'CommandLineInc';
-require( DO_MAINTENANCE );
+require RUN_MAINTENANCE_IF_MAIN;