diff options
Diffstat (limited to 'maintenance/eval.php')
| -rw-r--r-- | maintenance/eval.php | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/maintenance/eval.php b/maintenance/eval.php index 3cc1d16a..33c9a5d7 100644 --- a/maintenance/eval.php +++ b/maintenance/eval.php @@ -12,6 +12,21 @@ * To get decent line editing behavior, you should compile PHP with support * for GNU readline (pass --with-readline to configure). * + * 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 */ @@ -30,8 +45,11 @@ if ( isset( $options['d'] ) ) { } if ( $d > 1 ) { $lb = wfGetLB(); - foreach ( $lb->mServers as $i => $server ) { - $lb->mServers[$i]['flags'] |= DBO_DEBUG; + $serverCount = $lb->getServerCount(); + for ( $i = 0; $i < $serverCount; $i++ ) { + $server = $lb->getServerInfo( $i ); + $server['flags'] |= DBO_DEBUG; + $lb->setServerInfo( $i, $server ); } } if ( $d > 2 ) { @@ -59,7 +77,7 @@ while ( ( $line = Maintenance::readconsole() ) !== false ) { readline_write_history( $historyFile ); } $val = eval( $line . ";" ); - if ( is_null( $val ) ) { + if ( wfIsHipHop() || is_null( $val ) ) { echo "\n"; } elseif ( is_string( $val ) || is_numeric( $val ) ) { echo "$val\n"; |