From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 18 Nov 2016 18:41:16 +0000 (+0000)
Subject: Merge "Add 'autocomplete' option to HTMLTextField"
X-Git-Tag: 1.31.0-rc.0~4824
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=5111bd2def4e63ecc8a2acbf468e5c39029f9efd;p=lhc%2Fweb%2Fwiklou.git

Merge "Add 'autocomplete' option to HTMLTextField"
---

5111bd2def4e63ecc8a2acbf468e5c39029f9efd
diff --cc includes/htmlform/fields/HTMLAutoCompleteSelectField.php
index 0f86ee8bae,ebe57702d6..b0890c6778
--- a/includes/htmlform/fields/HTMLAutoCompleteSelectField.php
+++ b/includes/htmlform/fields/HTMLAutoCompleteSelectField.php
@@@ -25,11 -25,15 +25,15 @@@
   *   other-message - Message to use instead of htmlform-selectorother-other for
   *      the 'other' message.
   *   other - Raw text to use for the 'other' message
+  *
+  * The old name of autocomplete-data[-messages] was autocomplete[-messages] which is still
+  * recognized but deprecated since MediaWiki 1.29 since it conflicts with how autocomplete is
+  * used in HTMLTextField.
   */
  class HTMLAutoCompleteSelectField extends HTMLTextField {
- 	protected $autocomplete = [];
+ 	protected $autocompleteData = [];
  
 -	function __construct( $params ) {
 +	public function __construct( $params ) {
  		$params += [
  			'require-match' => false,
  		];