Fix typo in SpecialVersion

Change require to require_once in commandLine.inc

Make eval.php require an absolute path rather than just one in itself

Simplify if statement

diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php
index 92e4340..8185fe8 100644 (file)
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -368,7 +368,7 @@ class SpecialVersion extends SpecialPage {
        }
 
        /**
-        * Creates and formats the creidts for a single extension and returns this.
+        * Creates and formats the credits for a single extension and returns this.
         *
         * @param $extension Array
         *

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index 4b6422a..c7adbfb 100644 (file)
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 global $optionsWithArgs;
 if ( !isset( $optionsWithArgs ) ) {

diff --git a/maintenance/eval.php b/maintenance/eval.php
index 9ad51bb..3bd164f 100644 (file)
--- a/maintenance/eval.php
+++ b/maintenance/eval.php
@@ -34,7 +34,7 @@
 $optionsWithArgs = array( 'd' );
 
 /** */
-require_once( "commandLine.inc" );
+require_once( dirname( __FILE__ ) . "/commandLine.inc" );
 
 if ( isset( $options['d'] ) ) {
        $d = $options['d'];
@@ -55,13 +55,8 @@ if ( isset( $options['d'] ) ) {
        }
 }
 
-if ( function_exists( 'readline_add_history' )
-       && Maintenance::posix_isatty( 0 /*STDIN*/ ) )
-{
-       $useReadline = true;
-} else {
-       $useReadline = false;
-}
+$useReadline = function_exists( 'readline_add_history' )
+                       && Maintenance::posix_isatty( 0 /*STDIN*/ );
 
 if ( $useReadline ) {
        $historyFile = isset( $_ENV['HOME'] ) ?