From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 1 Aug 2014 22:49:36 +0000 (+0000)
Subject: Merge "Separate select() parameter summary from detail"
X-Git-Tag: 1.31.0-rc.0~14626
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=25b73462a10fa359e917926cab49bf9bc5575ee5;hp=15d3431d98e377ef7ac251eba86a29802e5c959b;p=lhc%2Fweb%2Fwiklou.git

Merge "Separate select() parameter summary from detail"
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index df19a499c2..62d64eb35c 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1490,6 +1490,7 @@ abstract class DatabaseBase implements IDatabase, DatabaseType {
 	 * @param array $options Query options
 	 * @param array $join_conds Join conditions
 	 *
+	 *
 	 * @param string|array $table
 	 *
 	 * May be either an array of table names, or a single string holding a table