From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Mon, 12 Aug 2013 09:28:15 +0200
Subject: Update to MediaWiki 1.21.1

---
 includes/installer/PostgresInstaller.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'includes/installer/PostgresInstaller.php')

diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php
index 3ac2b3a8..4e5ae8cf 100644
--- a/includes/installer/PostgresInstaller.php
+++ b/includes/installer/PostgresInstaller.php
@@ -125,9 +125,9 @@ class PostgresInstaller extends DatabaseInstaller {
 
 	/**
 	 * Open a PG connection with given parameters
-	 * @param $user string User name
-	 * @param $password string Password
-	 * @param $dbName string Database name
+	 * @param string $user User name
+	 * @param string $password Password
+	 * @param string $dbName Database name
 	 * @return Status
 	 */
 	protected function openConnectionWithParams( $user, $password, $dbName ) {
@@ -147,7 +147,7 @@ class PostgresInstaller extends DatabaseInstaller {
 
 	/**
 	 * Get a special type of connection
-	 * @param $type string See openPgConnection() for details.
+	 * @param string $type See openPgConnection() for details.
 	 * @return Status
 	 */
 	protected function getPgConnection( $type ) {
@@ -183,13 +183,14 @@ class PostgresInstaller extends DatabaseInstaller {
 	 * separate connection for this allows us to avoid accidental cross-module
 	 * dependencies.
 	 *
-	 * @param $type string The type of connection to get:
+	 * @param string $type The type of connection to get:
 	 *    - create-db:     A connection for creating DBs, suitable for pre-
 	 *                     installation.
 	 *    - create-schema: A connection to the new DB, for creating schemas and
 	 *                     other similar objects in the new DB.
 	 *    - create-tables: A connection with a role suitable for creating tables.
 	 *
+	 * @throws MWException
 	 * @return Status object. On success, a connection object will be in the
 	 *   value member.
 	 */
@@ -382,9 +383,9 @@ class PostgresInstaller extends DatabaseInstaller {
 	/**
 	 * Recursive helper for canCreateObjectsForWebUser().
 	 * @param $conn DatabaseBase object
-	 * @param $targetMember int Role ID of the member to look for
-	 * @param $group int Role ID of the group to look for
-	 * @param $maxDepth int Maximum recursive search depth
+	 * @param int $targetMember Role ID of the member to look for
+	 * @param int $group Role ID of the group to look for
+	 * @param int $maxDepth Maximum recursive search depth
 	 * @return bool
 	 */
 	protected function isRoleMember( $conn, $targetMember, $group, $maxDepth ) {
@@ -530,8 +531,8 @@ class PostgresInstaller extends DatabaseInstaller {
 		$schema = $this->getVar( 'wgDBmwschema' );
 		return
 "# Postgres specific settings
-\$wgDBport           = \"{$port}\";
-\$wgDBmwschema       = \"{$schema}\";";
+\$wgDBport = \"{$port}\";
+\$wgDBmwschema = \"{$schema}\";";
 	}
 
 	public function preUpgrade() {
-- 
cgit v1.2.3-54-g00ecf