Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 4 insertions, 4 deletions

diff --git a/maintenance/pruneFileCache.php b/maintenance/pruneFileCache.php
index 48d38977..455e9c07 100644
--- a/maintenance/pruneFileCache.php
+++ b/maintenance/pruneFileCache.php
@@ -75,8 +75,8 @@ class PruneFileCache extends Maintenance {
 	}
 
 	/**
-	 * @param $dir string
-	 * @param $report string|bool Use 'report' to report the directories being scanned
+	 * @param string $dir
+	 * @param string|bool $report Use 'report' to report the directories being scanned
 	 */
 	protected function prune_directory( $dir, $report = false ) {
 		$tsNow = time();
@@ -95,8 +95,8 @@ class PruneFileCache extends Maintenance {
 					// Sanity check the file extension against known cache types
 					if ( $mts < $this->minSurviveTimestamp
 						&& preg_match( '/\.(?:html|cache)(?:\.gz)?$/', $file )
-						&& unlink( $path ) )
-					{
+						&& unlink( $path )
+					) {
 						$daysOld = round( ( $tsNow - $mts ) / 86400, 2 );
 						$this->output( "Deleted `$path` [days=$daysOld]\n" );
 					}