Update to MediaWiki 1.20.2

this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024

1 files changed, 15 insertions, 5 deletions

diff --git a/maintenance/mctest.php b/maintenance/mctest.php
index 359cd248..691b832b 100644
--- a/maintenance/mctest.php
+++ b/maintenance/mctest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * This script makes several 'set', 'incr' and 'get' requests on every
- * memcached server and shows a report.
+ * Makes several 'set', 'incr' and 'get' requests on every memcached
+ * server and shows a report.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,11 +18,18 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
+/**
+ * Maintenance script that  makes several 'set', 'incr' and 'get' requests
+ * on every memcached server and shows a report.
+ *
+ * @ingroup Maintenance
+ */
 class mcTest extends Maintenance {
 	public function __construct() {
 		parent::__construct();
@@ -33,7 +40,7 @@ class mcTest extends Maintenance {
 	}
 
 	public function execute() {
-		global $wgMemCachedServers;
+		global $wgMemCachedServers, $wgMemCachedTimeout;
 
 		$iterations = $this->getOption( 'i', 100 );
 		if ( $this->hasArg() ) {
@@ -42,7 +49,10 @@ class mcTest extends Maintenance {
 
 		foreach ( $wgMemCachedServers as $server ) {
 			$this->output( $server . " ", $server );
-			$mcc = new MemCachedClientforWiki( array( 'persistant' => true ) );
+			$mcc = new MemCachedClientforWiki( array(
+				'persistant' => true,
+				'timeout' => $wgMemCachedTimeout
+			) );
 			$mcc->set_servers( array( $server ) );
 			$set = 0;
 			$incr = 0;