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 "rdbms: Use correct value for 'sslmode' in DatabasePostgres"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialEmailuser.php
diff --git
a/includes/specials/SpecialEmailuser.php
b/includes/specials/SpecialEmailuser.php
index
aebec2f
..
887f905
100644
(file)
--- a/
includes/specials/SpecialEmailuser.php
+++ b/
includes/specials/SpecialEmailuser.php
@@
-108,9
+108,7
@@
class SpecialEmailUser extends UnlistedSpecialPage {
$request = $this->getRequest();
$out->addModuleStyles( 'mediawiki.special' );
$request = $this->getRequest();
$out->addModuleStyles( 'mediawiki.special' );
- $this->mTarget = is_null( $par )
- ? $request->getVal( 'wpTarget', $request->getVal( 'target', '' ) )
- : $par;
+ $this->mTarget = $par ?? $request->getVal( 'wpTarget', $request->getVal( 'target', '' ) );
// Make sure, that HTMLForm uses the correct target.
$request->setVal( 'wpTarget', $this->mTarget );
// Make sure, that HTMLForm uses the correct target.
$request->setVal( 'wpTarget', $this->mTarget );
@@
-468,7
+466,7
@@
class SpecialEmailUser extends UnlistedSpecialPage {
if ( $data['CCMe'] && $to != $from ) {
$ccTo = $from;
$ccFrom = $from;
if ( $data['CCMe'] && $to != $from ) {
$ccTo = $from;
$ccFrom = $from;
- $ccSubject = $context->msg( 'emailccsubject' )->
raw
Params(
+ $ccSubject = $context->msg( 'emailccsubject' )->
plaintext
Params(
$target->getName(), $subject )->text();
$ccText = $text;
$target->getName(), $subject )->text();
$ccText = $text;