From: umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 3 Jan 2014 20:35:21 +0000 (+0100)
Subject: Fix doc for Database::upsert
X-Git-Tag: 1.31.0-rc.0~17391
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=8a2e1a4c88d5fa7ee4c92e3775d1c362aaccc534;p=lhc%2Fweb%2Fwiklou.git

Fix doc for Database::upsert

One @params too much

Change-Id: I8cea6228587574ff90060d46b4430b2348a68973
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index e4ff5ee450..2e19f6acbd 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2681,7 +2681,6 @@ abstract class DatabaseBase implements IDatabase, DatabaseType {
 	 *                to set that field to. The data will be quoted by
 	 *                DatabaseBase::addQuotes().
 	 * @param string $fname Calling function name (use __METHOD__) for logs/profiling
-	 * @param array $options of options
 	 *
 	 * @return bool
 	 * @since 1.22
diff --git a/includes/db/DatabaseMysqlBase.php b/includes/db/DatabaseMysqlBase.php
index 14369bf1ed..12fee941c3 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -935,7 +935,6 @@ abstract class DatabaseMysqlBase extends DatabaseBase {
 	 * @param array $uniqueIndexes
 	 * @param array $set
 	 * @param string $fname
-	 * @param array $options
 	 * @return bool
 	 */
 	public function upsert(