| Index: trunk/phase3/maintenance/commandLine.inc |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | * @ingroup Maintenance |
| 23 | 23 | */ |
| 24 | 24 | |
| 25 | | -require( dirname( __FILE__ ) . '/Maintenance.php' ); |
| | 25 | +require_once( dirname( __FILE__ ) . '/Maintenance.php' ); |
| 26 | 26 | |
| 27 | 27 | global $optionsWithArgs; |
| 28 | 28 | if ( !isset( $optionsWithArgs ) ) { |
| Index: trunk/phase3/maintenance/eval.php |
| — | — | @@ -34,7 +34,7 @@ |
| 35 | 35 | $optionsWithArgs = array( 'd' ); |
| 36 | 36 | |
| 37 | 37 | /** */ |
| 38 | | -require_once( "commandLine.inc" ); |
| | 38 | +require_once( dirname( __FILE__ ) . "/commandLine.inc" ); |
| 39 | 39 | |
| 40 | 40 | if ( isset( $options['d'] ) ) { |
| 41 | 41 | $d = $options['d']; |
| — | — | @@ -55,13 +55,8 @@ |
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | | -if ( function_exists( 'readline_add_history' ) |
| 60 | | - && Maintenance::posix_isatty( 0 /*STDIN*/ ) ) |
| 61 | | -{ |
| 62 | | - $useReadline = true; |
| 63 | | -} else { |
| 64 | | - $useReadline = false; |
| 65 | | -} |
| | 59 | +$useReadline = function_exists( 'readline_add_history' ) |
| | 60 | + && Maintenance::posix_isatty( 0 /*STDIN*/ ); |
| 66 | 61 | |
| 67 | 62 | if ( $useReadline ) { |
| 68 | 63 | $historyFile = isset( $_ENV['HOME'] ) ? |
| Index: trunk/phase3/includes/specials/SpecialVersion.php |
| — | — | @@ -368,7 +368,7 @@ |
| 369 | 369 | } |
| 370 | 370 | |
| 371 | 371 | /** |
| 372 | | - * Creates and formats the creidts for a single extension and returns this. |
| | 372 | + * Creates and formats the credits for a single extension and returns this. |
| 373 | 373 | * |
| 374 | 374 | * @param $extension Array |
| 375 | 375 | * |