Merge branch 'archwiki'

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

1 files changed, 6 insertions, 4 deletions

diff --git a/includes/externalstore/ExternalStore.php b/includes/externalstore/ExternalStore.php
index 462b0b90..688130e0 100644
--- a/includes/externalstore/ExternalStore.php
+++ b/includes/externalstore/ExternalStore.php
@@ -59,6 +59,7 @@ class ExternalStore {
 		}
 
 		$class = 'ExternalStore' . ucfirst( $proto );
+
 		// Any custom modules should be added to $wgAutoLoadClasses for on-demand loading
 		return class_exists( $class ) ? new $class( $params ) : false;
 	}
@@ -120,6 +121,7 @@ class ExternalStore {
 				$retval[$url] = false;
 			}
 		}
+
 		return $retval;
 	}
 
@@ -129,7 +131,7 @@ class ExternalStore {
 	 * class itself as a parameter.
 	 *
 	 * @param string $url A partial external store URL ("<store type>://<location>")
-	 * @param $data string
+	 * @param string $data
 	 * @param array $params Associative array of ExternalStoreMedium parameters
 	 * @return string|bool The URL of the stored data item, or false on error
 	 * @throws MWException
@@ -176,7 +178,7 @@ class ExternalStore {
 	 * itself. It also fails-over to the next possible clusters
 	 * as provided in the first parameter.
 	 *
-	 * @param array $tryStores refer to $wgDefaultExternalStore
+	 * @param array $tryStores Refer to $wgDefaultExternalStore
 	 * @param string $data
 	 * @param array $params Associative array of ExternalStoreMedium parameters
 	 * @return string|bool The URL of the stored data item, or false on error
@@ -216,8 +218,8 @@ class ExternalStore {
 	}
 
 	/**
-	 * @param $data string
-	 * @param $wiki string
+	 * @param string $data
+	 * @param string $wiki
 	 * @return string|bool The URL of the stored data item, or false on error
 	 * @throws MWException
 	 */