Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix exception in preferences when nickname is invalid and fancysig is on"

Browse source
This commit is contained in:
jenkins-bot 2021-08-27 19:10:27 +00:00 committed by Gerrit Code Review
commit 7de310e320
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
includes/parser/Parser.php
View file

@ -4669,6 +4669,7 @@ class Parser {
}
if ( $nickname === null || $nickname === '' ) {
// Empty value results in the default signature (even when fancysig is enabled)
$nickname = $username;
} elseif ( mb_strlen( $nickname ) > $this->svcOptions->get( 'MaxSigChars' ) ) {
$nickname = $username;

18
includes/preferences/DefaultPreferencesFactory.php
View file

@ -599,15 +599,15 @@ class DefaultPreferencesFactory implements PreferencesFactory {
);
$signatureFieldConfig = [];
// Validate existing signature and show a message about it
if ( $this->userOptionsManager->getBoolOption( $user, 'fancysig' ) ) {
$signature = $this->userOptionsManager->getOption( $user, 'nickname' );
$useFancySig = $this->userOptionsManager->getBoolOption( $user, 'fancysig' );
if ( $useFancySig && $signature !== '' ) {
$validator = new SignatureValidator(
$user,
$context,
ParserOptions::newFromContext( $context )
);
$signatureErrors = $validator->validateSignature(
$this->userOptionsManager->getOption( $user, 'nickname' )
);
$signatureErrors = $validator->validateSignature( $signature );
if ( $signatureErrors ) {
$sigValidation = $this->options->get( 'SignatureValidation' );
$oldsigHTML .= '<p><strong>' .
@ -1609,6 +1609,12 @@ class DefaultPreferencesFactory implements PreferencesFactory {
return $form->msg( 'badsiglength' )->numParams( $maxSigChars )->escaped();
}
if ( $signature === '' ) {
// Make sure leaving the field empty is valid, since that's used as the default (T288151).
// Code using this preference in Parser::getUserSig() handles this case specially.
return true;
}
// Remaining checks only apply to fancy signatures
if ( !( isset( $alldata['fancysig'] ) && $alldata['fancysig'] ) ) {
return true;
@ -1625,10 +1631,6 @@ class DefaultPreferencesFactory implements PreferencesFactory {
//
// Otherwise it would be completely removed when the user opens their preferences page, which
// would be very unfriendly.
//
// Additionally, if it was removed in that way, it would reset to the default value of '',
// which is actually invalid when 'fancysig' is enabled, which would cause an exception like
// "Default '' is invalid for preference...".
$user = $form->getUser();
if (
$signature === $this->userOptionsManager->getOption( $user, 'nickname' ) &&