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
resourceloader: Remove comment about XmlJsCode wrapper
[lhc/web/wiklou.git]
/
includes
/
preferences
/
DefaultPreferencesFactory.php
diff --git
a/includes/preferences/DefaultPreferencesFactory.php
b/includes/preferences/DefaultPreferencesFactory.php
index
001c975
..
8a82add
100644
(file)
--- a/
includes/preferences/DefaultPreferencesFactory.php
+++ b/
includes/preferences/DefaultPreferencesFactory.php
@@
-232,7
+232,10
@@
class DefaultPreferencesFactory implements PreferencesFactory {
} elseif ( $field->validate( $globalDefault, $user->getOptions() ) === true ) {
$info['default'] = $globalDefault;
} else {
} elseif ( $field->validate( $globalDefault, $user->getOptions() ) === true ) {
$info['default'] = $globalDefault;
} else {
- throw new MWException( "Global default '$globalDefault' is invalid for field $name" );
+ $globalDefault = json_encode( $globalDefault );
+ throw new MWException(
+ "Default '$globalDefault' is invalid for preference $name of user $user"
+ );
}
}
}
}
@@
-537,6
+540,7
@@
class DefaultPreferencesFactory implements PreferencesFactory {
if ( $this->options->get( 'EnableEmail' ) ) {
if ( $canViewPrivateInfo ) {
if ( $this->options->get( 'EnableEmail' ) ) {
if ( $canViewPrivateInfo ) {
+ $helpMessages = [];
$helpMessages[] = $this->options->get( 'EmailConfirmToEdit' )
? 'prefs-help-email-required'
: 'prefs-help-email';
$helpMessages[] = $this->options->get( 'EmailConfirmToEdit' )
? 'prefs-help-email-required'
: 'prefs-help-email';
@@
-1582,12
+1586,11
@@
class DefaultPreferencesFactory implements PreferencesFactory {
* Handle the form submission if everything validated properly
*
* @param array $formData
* Handle the form submission if everything validated properly
*
* @param array $formData
- * @param
HTMLForm
$form
+ * @param
PreferencesFormOOUI
$form
* @param array[] $formDescriptor
* @return bool|Status|string
*/
* @param array[] $formDescriptor
* @return bool|Status|string
*/
- protected function saveFormData( $formData, HTMLForm $form, array $formDescriptor ) {
- /** @var \User $user */
+ protected function saveFormData( $formData, PreferencesFormOOUI $form, array $formDescriptor ) {
$user = $form->getModifiedUser();
$hiddenPrefs = $this->options->get( 'HiddenPrefs' );
$result = true;
$user = $form->getModifiedUser();
$hiddenPrefs = $this->options->get( 'HiddenPrefs' );
$result = true;
@@
-1685,11
+1688,15
@@
class DefaultPreferencesFactory implements PreferencesFactory {
* Save the form data and reload the page
*
* @param array $formData
* Save the form data and reload the page
*
* @param array $formData
- * @param
HTMLForm
$form
+ * @param
PreferencesFormOOUI
$form
* @param array $formDescriptor
* @return Status
*/
* @param array $formDescriptor
* @return Status
*/
- protected function submitForm( array $formData, HTMLForm $form, array $formDescriptor ) {
+ protected function submitForm(
+ array $formData,
+ PreferencesFormOOUI $form,
+ array $formDescriptor
+ ) {
$res = $this->saveFormData( $formData, $form, $formDescriptor );
if ( $res === true ) {
$res = $this->saveFormData( $formData, $form, $formDescriptor );
if ( $res === true ) {
@@
-1723,6
+1730,7
@@
class DefaultPreferencesFactory implements PreferencesFactory {
*/
protected function getTimeZoneList( Language $language ) {
$identifiers = DateTimeZone::listIdentifiers();
*/
protected function getTimeZoneList( Language $language ) {
$identifiers = DateTimeZone::listIdentifiers();
+ // @phan-suppress-next-line PhanTypeComparisonFromArray See phan issue #3162
if ( $identifiers === false ) {
return [];
}
if ( $identifiers === false ) {
return [];
}