From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 6 Dec 2013 00:28:29 +0000 (+0000)
Subject: Merge "Update documentation for log related classes"
X-Git-Tag: 1.31.0-rc.0~17753
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=5c5255e227c3a9b6c5a3508d488423907f725040;p=lhc%2Fweb%2Fwiklou.git

Merge "Update documentation for log related classes"
---

5c5255e227c3a9b6c5a3508d488423907f725040
diff --cc includes/logging/LogEventsList.php
index d316c5d8b8,d018b3cced..c069fdbbc9
--- a/includes/logging/LogEventsList.php
+++ b/includes/logging/LogEventsList.php
@@@ -60,10 -61,9 +61,10 @@@ class LogEventsList extends ContextSour
  	 * Deprecated alias for getTitle(); do not use.
  	 *
  	 * @deprecated in 1.20; use getTitle() instead.
- 	 * @return Title object
+ 	 * @return Title
  	 */
  	public function getDisplayTitle() {
 +		wfDeprecated( __METHOD__, '1.20' );
  		return $this->getTitle();
  	}
  
@@@ -89,18 -89,17 +90,18 @@@
  	/**
  	 * Show options for the log list
  	 *
- 	 * @param string $types or Array
- 	 * @param $user String
- 	 * @param $page String
- 	 * @param $pattern String
- 	 * @param $year Integer: year
- 	 * @param $month Integer: month
- 	 * @param $filter: array
- 	 * @param $tagFilter: array?
+ 	 * @param array|string $types
+ 	 * @param string $user
+ 	 * @param string $page
+ 	 * @param string $pattern
+ 	 * @param int $year Year
+ 	 * @param int $month Month
+ 	 * @param array $filter
+ 	 * @param string $tagFilter Tag to select by default
  	 */
 -	public function showOptions( $types = array(), $user = '', $page = '', $pattern = '', $year = '',
 -		$month = '', $filter = null, $tagFilter = '' ) {
 +	public function showOptions( $types = array(), $user = '', $page = '', $pattern = '', $year = 0,
 +		$month = 0, $filter = null, $tagFilter = ''
 +	) {
  		global $wgScript, $wgMiserMode;
  
  		$title = SpecialPage::getTitleFor( 'Log' );