1 files changed, 12 insertions, 14 deletions

diff --git a/maintenance/dumpHTML.inc b/maintenance/dumpHTML.inc
index 702c7df9..ca2a7df6 100644
--- a/maintenance/dumpHTML.inc
+++ b/maintenance/dumpHTML.inc
@@ -1,7 +1,6 @@
 <?php
 /**
- * @package MediaWiki
- * @subpackage Maintenance
+ * @addtogroup Maintenance
  */
 
 define( 'REPORTING_INTERVAL', 10 );
@@ -244,10 +243,9 @@ class DumpHTML {
 	 * have a local image
 	 */
 	function doLocalImageDescriptions() {
-		global $wgSharedUploadDirectory;
 		$chunkSize = 1000;
 
-		$dbr =& wfGetDB( DB_SLAVE );
+		$dbr = wfGetDB( DB_SLAVE );
 		
 		$cp = $this->getCheckpoint( 'local image' );
 		if ( $cp == 'done' ) {
@@ -347,7 +345,7 @@ class DumpHTML {
 		$chunkSize = 1000;
 		
 		$this->setupGlobals();
-		$dbr =& wfGetDB( DB_SLAVE );
+		$dbr = wfGetDB( DB_SLAVE );
 		
 		$cp = $this->getCheckpoint( 'category' );
 		if ( $cp == 'done' ) {
@@ -410,7 +408,7 @@ class DumpHTML {
 		}
 
 		$this->setupGlobals();
-		$dbr =& wfGetDB( DB_SLAVE );
+		$dbr = wfGetDB( DB_SLAVE );
 		$i = 0;
 
 		for ( $chunkStart = $start; $chunkStart <= $end; $chunkStart += $chunkSize ) {
@@ -443,9 +441,6 @@ class DumpHTML {
 
 	/** Write an article specified by title */
 	function doArticle( $title ) {
-		global $wgTitle, $wgSharedUploadPath, $wgSharedUploadDirectory;
-		global $wgUploadDirectory;
-
 		if ( $this->noOverwrite ) {
 			$fileName = $this->dest.'/'.$this->getHashedFilename( $title );
 			if ( file_exists( $fileName ) ) {
@@ -484,7 +479,7 @@ class DumpHTML {
 				print "Writing $file\n";
 				$file = fopen( $path, 'w' );
 				if ( !$file ) {
-					print("Can't open file $fullName for writing\n");
+					print("Can't open file $path for writing\n");
 					continue;
 				}
 				fwrite( $file, $text );
@@ -496,7 +491,7 @@ class DumpHTML {
 	}
 
 	/** Write the given text to the file identified by the given title object */
-	function writeArticle( &$title, $text ) {
+	function writeArticle( $title, $text ) {
 		$filename = $this->getHashedFilename( $title );
 
 		# Temporary hack for current dump, this should be moved to 
@@ -536,7 +531,7 @@ class DumpHTML {
 
 	/** Set up globals required for parsing */
 	function setupGlobals( $currentDepth = NULL ) {
-		global $wgUser, $wgTitle, $wgStylePath, $wgArticlePath, $wgMathPath;
+		global $wgUser, $wgStylePath, $wgArticlePath, $wgMathPath;
 		global $wgUploadPath, $wgLogo, $wgMaxCredits, $wgSharedUploadPath;
 		global $wgHideInterlanguageLinks, $wgUploadDirectory, $wgThumbnailScriptPath;
 		global $wgSharedThumbnailScriptPath, $wgEnableParserCache, $wgHooks, $wgServer;
@@ -623,7 +618,7 @@ class DumpHTML {
 	}
 
 	/** Reads the content of a title object, executes the skin and captures the result */
-	function getArticleHTML( &$title ) {
+	function getArticleHTML( $title ) {
 		global $wgOut, $wgTitle, $wgArticle, $wgUser;
 
 		$linkCache =& LinkCache::singleton();
@@ -800,6 +795,7 @@ ENDTEXT;
 
 		$url = false;
 		if ( $query != '' ) {
+			$params = array();
 			parse_str( $query, $params );
 			if ( isset($params['action']) && $params['action'] == 'raw' ) {
 				if ( $params['gen'] == 'css' || $params['gen'] == 'js' ) {
@@ -807,6 +803,7 @@ ENDTEXT;
 				} else {
 					$file = $this->getFriendlyName( $title->getPrefixedDBkey() );
 					// Clean up Monobook.css etc.
+					$matches = array();
 					if ( preg_match( '/^(.*)\.(css|js)_[0-9a-f]{4}$/', $file, $matches ) ) {
 						$file = $matches[1] . '.' . $matches[2];
 					}
@@ -882,6 +879,7 @@ ENDTEXT;
 		}
 
 		# Split into characters
+		$m = array();
 		preg_match_all( '/./us', $dbk, $m );
 
 		$chars = $m[0];
@@ -958,7 +956,7 @@ ENDTEXT;
 
 	function getMaxPageID() {
 		if ( $this->maxPageID === false ) {
-			$dbr =& wfGetDB( DB_SLAVE );
+			$dbr = wfGetDB( DB_SLAVE );
 			$this->maxPageID = $dbr->selectField( 'page', 'max(page_id)', false, __METHOD__ );
 		}
 		return $this->maxPageID;