diff options
Diffstat (limited to 'maintenance/importUseModWiki.php')
| -rw-r--r-- | maintenance/importUseModWiki.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maintenance/importUseModWiki.php b/maintenance/importUseModWiki.php index 15f5e444..ae5dd23b 100644 --- a/maintenance/importUseModWiki.php +++ b/maintenance/importUseModWiki.php @@ -22,8 +22,7 @@ * 2005-03-14 * * @todo document - * @package MediaWiki - * @subpackage Maintenance + * @addtogroup Maintenance */ if( php_sapi_name() != 'cli' ) { @@ -90,6 +89,7 @@ function importPageDirectory( $dir, $prefix = "" ) echo "\n<!-- Checking page directory " . xmlCommentSafe( $dir ) . " -->\n"; $mydir = opendir( $dir ); while( $entry = readdir( $mydir ) ) { + $m = array(); if( preg_match( '/^(.+)\.db$/', $entry, $m ) ) { echo importPage( $prefix . $m[1] ); } else { @@ -121,7 +121,7 @@ function useModFilename( $title ) { function fetchPage( $title ) { - global $FS,$FS1,$FS2,$FS3, $wgRootDirectory; + global $FS1,$FS2,$FS3, $wgRootDirectory; $fname = $wgRootDirectory . "/page/" . useModFilename( $title ) . ".db"; if( !file_exists( $fname ) ) { @@ -140,7 +140,7 @@ function fetchPage( $title ) function fetchKeptPages( $title ) { - global $FS,$FS1,$FS2,$FS3, $wgRootDirectory, $wgTimezoneCorrection; + global $FS1,$FS2,$FS3, $wgRootDirectory; $fname = $wgRootDirectory . "/keep/" . useModFilename( $title ) . ".kp"; if( !file_exists( $fname ) ) return array(); @@ -235,13 +235,13 @@ END; # History $revisions = array_merge( $revisions, fetchKeptPages( $title ) ); if(count( $revisions ) == 0 ) { - return $sql; + return NULL; // Was "$sql", which does not appear to be defined. } foreach( $revisions as $rev ) { $text = xmlsafe( recodeText( $rev->text ) ); $minor = ($rev->minor ? '<minor/>' : ''); - list( $userid, $username ) = checkUserCache( $rev->username, $rev->host ); + list( /* $userid */ , $username ) = checkUserCache( $rev->username, $rev->host ); $username = xmlsafe( recodeText( $username ) ); $timestamp = xmlsafe( timestamp2ISO8601( $rev->ts ) ); $comment = xmlsafe( recodeText( $rev->summary ) ); |