From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 8 Oct 2005 11:26:31 +0000 (+0000)
Subject: fixed array concatenation
X-Git-Tag: 1.6.0~1509
X-Git-Url: http://git.cyclocoop.org/%22.%20generer_url_ecrire%28%22sites_tous%22%2C%22%22%29.%20%22?a=commitdiff_plain;h=35463acfa43dabf89f8d8b8129c454fcf1d077bd;p=lhc%2Fweb%2Fwiklou.git

fixed array concatenation
---

diff --git a/maintenance/dumpHTML.inc b/maintenance/dumpHTML.inc
index be9f4b414a..6025802002 100644
--- a/maintenance/dumpHTML.inc
+++ b/maintenance/dumpHTML.inc
@@ -144,8 +144,8 @@ class DumpHTML {
 		$i = 0;
 		for ( $hash = 0; $hash < 256; $hash++ ) {				
 			$dir = sprintf( "%01x/%02x", intval( $hash / 16 ), $hash );
-			$paths = glob( "{$this->sharedStaticPath}/$dir/*" );
-			$paths += glob( "{$this->sharedStaticPath}/thumb/$dir/*" );
+			$paths = array_merge( glob( "{$this->sharedStaticPath}/$dir/*" ),
+				glob( "{$this->sharedStaticPath}/thumb/$dir/*" ) );
 
 			foreach ( $paths as $path ) {
 				$file = basename( $path );