From 2587017c336f7dd3a76eca4cba38f8d433ccb7ac Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Thu, 12 Jan 2012 22:14:56 +0000 Subject: [PATCH] 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 --- includes/specials/SpecialVersion.php | 2 +- maintenance/commandLine.inc | 2 +- maintenance/eval.php | 11 +++-------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php index 92e434033b..8185fe8863 100644 --- 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 4b6422a63f..c7adbfbc9e 100644 --- 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 9ad51bb60a..3bd164fdaf 100644 --- 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'] ) ? -- 2.20.1