Merge branch 'archwiki'

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

1 files changed, 3 insertions, 4 deletions

diff --git a/maintenance/benchmarks/bench_HTTP_HTTPS.php b/maintenance/benchmarks/bench_HTTP_HTTPS.php
index 6f800fb3..bb7499b7 100644
--- a/maintenance/benchmarks/bench_HTTP_HTTPS.php
+++ b/maintenance/benchmarks/bench_HTTP_HTTPS.php
@@ -31,8 +31,7 @@ require_once __DIR__ . '/Benchmarker.php';
  *
  * @ingroup Benchmark
  */
-class bench_HTTP_HTTPS extends Benchmarker {
-
+class BenchHttpHttps extends Benchmarker {
 	public function __construct() {
 		parent::__construct();
 		$this->mDescription = "Benchmark HTTP request vs HTTPS request.";
@@ -42,7 +41,7 @@ class bench_HTTP_HTTPS extends Benchmarker {
 		$this->bench( array(
 			array( 'function' => array( $this, 'getHTTP' ) ),
 			array( 'function' => array( $this, 'getHTTPS' ) ),
-		));
+		) );
 		print $this->getFormattedResults();
 	}
 
@@ -61,5 +60,5 @@ class bench_HTTP_HTTPS extends Benchmarker {
 	}
 }
 
-$maintClass = 'bench_HTTP_HTTPS';
+$maintClass = 'BenchHttpHttps';
 require_once RUN_MAINTENANCE_IF_MAIN;