diff options
Diffstat (limited to 'maintenance/FiveUpgrade.inc')
| -rw-r--r-- | maintenance/FiveUpgrade.inc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/maintenance/FiveUpgrade.inc b/maintenance/FiveUpgrade.inc index 7caf6810..4bbf0733 100644 --- a/maintenance/FiveUpgrade.inc +++ b/maintenance/FiveUpgrade.inc @@ -64,7 +64,7 @@ class FiveUpgrade { function &newConnection() { global $wgDBadminuser, $wgDBadminpassword; global $wgDBserver, $wgDBname; - $db =& new Database( $wgDBserver, $wgDBadminuser, $wgDBadminpassword, $wgDBname ); + $db = new Database( $wgDBserver, $wgDBadminuser, $wgDBadminpassword, $wgDBname ); return $db; } @@ -159,8 +159,7 @@ class FiveUpgrade { * @access private */ function log( $message ) { - global $wgDBname; - echo $wgDBname . ' ' . wfTimestamp( TS_DB ) . ': ' . $message . "\n"; + echo wfWikiID() . ' ' . wfTimestamp( TS_DB ) . ': ' . $message . "\n"; flush(); } @@ -804,7 +803,7 @@ END; array_shift( $against ); } - array_push( $pieces, basename( $path ) ); + array_push( $pieces, wfBaseName( $path ) ); return implode( '/', $pieces ); } |