Merge branch 'archwiki'

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

1 files changed, 6 insertions, 6 deletions

diff --git a/maintenance/benchmarks/bench_wfIsWindows.php b/maintenance/benchmarks/bench_wfIsWindows.php
index 1cd2016b..8446694b 100644
--- a/maintenance/benchmarks/bench_wfIsWindows.php
+++ b/maintenance/benchmarks/bench_wfIsWindows.php
@@ -31,8 +31,7 @@ require_once __DIR__ . '/Benchmarker.php';
  *
  * @ingroup Benchmark
  */
-class bench_wfIsWindows extends Benchmarker {
-
+class BenchWfIsWindows extends Benchmarker {
 	public function __construct() {
 		parent::__construct();
 		$this->mDescription = "Benchmark for wfIsWindows.";
@@ -42,12 +41,12 @@ class bench_wfIsWindows extends Benchmarker {
 		$this->bench( array(
 			array( 'function' => array( $this, 'wfIsWindows' ) ),
 			array( 'function' => array( $this, 'wfIsWindowsCached' ) ),
-		));
+		) );
 		print $this->getFormattedResults();
 	}
 
 	static function is_win() {
-		return substr( php_uname(), 0, 7 ) == 'Windows' ;
+		return substr( php_uname(), 0, 7 ) == 'Windows';
 	}
 
 	// bench function 1
@@ -58,12 +57,13 @@ class bench_wfIsWindows extends Benchmarker {
 	// bench function 2
 	function wfIsWindowsCached() {
 		static $isWindows = null;
-		if( $isWindows == null ) {
+		if ( $isWindows == null ) {
 			$isWindows = self::is_win();
 		}
+
 		return $isWindows;
 	}
 }
 
-$maintClass = 'bench_wfIsWindows';
+$maintClass = 'BenchWfIsWindows';
 require_once RUN_MAINTENANCE_IF_MAIN;