dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Don't armor french spaces before punctuation followed by word characters"
[lhc/web/wiklou.git]
/
includes
/
specials
/
forms
/
PreferencesFormOOUI.php
diff --git
a/includes/specials/forms/PreferencesFormOOUI.php
b/includes/specials/forms/PreferencesFormOOUI.php
index
3a5adbb
..
cfa8f8f
100644
(file)
--- a/
includes/specials/forms/PreferencesFormOOUI.php
+++ b/
includes/specials/forms/PreferencesFormOOUI.php
@@
-20,8
+20,10
@@
/**
* Form to edit user preferences.
/**
* Form to edit user preferences.
+ *
+ * @since 1.32
*/
*/
-class PreferencesFormOOUI extends OOUIHTMLForm
implements PreferencesForm
{
+class PreferencesFormOOUI extends OOUIHTMLForm {
// Override default value from HTMLForm
protected $mSubSectionBeforeFields = false;
// Override default value from HTMLForm
protected $mSubSectionBeforeFields = false;
@@
-103,7
+105,7
@@
class PreferencesFormOOUI extends OOUIHTMLForm implements PreferencesForm {
foreach ( $this->mFlatFields as $fieldname => $field ) {
if ( $field instanceof HTMLNestedFilterable ) {
$info = $field->mParams;
foreach ( $this->mFlatFields as $fieldname => $field ) {
if ( $field instanceof HTMLNestedFilterable ) {
$info = $field->mParams;
- $prefix =
isset( $info['prefix'] ) ? $info['prefix'] :
$fieldname;
+ $prefix =
$info['prefix'] ??
$fieldname;
foreach ( $field->filterDataForSubmit( $data[$fieldname] ) as $key => $value ) {
$data["$prefix$key"] = $value;
}
foreach ( $field->filterDataForSubmit( $data[$fieldname] ) as $key => $value ) {
$data["$prefix$key"] = $value;
}
@@
-225,7
+227,8
@@
class PreferencesFormOOUI extends OOUIHTMLForm implements PreferencesForm {
* @return string
*/
function getLegend( $key ) {
* @return string
*/
function getLegend( $key ) {
- $legend = parent::getLegend( $key );
+ $aliasKey = ( $key === 'optoutwatchlist' || $key === 'optoutrc' ) ? 'opt-out' : $key;
+ $legend = parent::getLegend( $aliasKey );
Hooks::run( 'PreferencesGetLegend', [ $this, $key, &$legend ] );
return $legend;
}
Hooks::run( 'PreferencesGetLegend', [ $this, $key, &$legend ] );
return $legend;
}