| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -302,7 +302,7 @@ |
| 303 | 303 | if( $article->mNamespace != NS_MAIN ) { |
| 304 | 304 | $pagetitle = $wgLang->getNsText( $article->mNamespace ) . ':' . $pagetitle; |
| 305 | 305 | } |
| 306 | | - $subject = str_replace( '$PAGETITLE_QP', wfQuotedPrintable( str_replace( '_', ' ', $pagetitle ) ), $subject); |
| | 306 | + $subject = str_replace( '$PAGETITLE', str_replace( '_', ' ', $pagetitle ) , $subject); |
| 307 | 307 | $keys['%24PAGETITLE_RAWURL'] = wfUrlencode( $pagetitle ); |
| 308 | 308 | $keys['$PAGETITLE_RAWURL'] = wfUrlencode( $pagetitle ); |
| 309 | 309 | $keys['%24PAGETITLE'] = $pagetitle; # needed for the {{localurl:$PAGETITLE}} in the messagetext, "$" appears here as "%24" |
| — | — | @@ -316,9 +316,9 @@ |
| 317 | 317 | # Reveal the page editor's address as REPLY-TO address only if |
| 318 | 318 | # the user has not opted-out and the option is enabled at the |
| 319 | 319 | # global configuration level. |
| 320 | | - $pageeditor_qp = wfQuotedPrintable( $pageeditorUser->getName() ); |
| | 320 | + $name = $pageeditorUser->getName(); |
| 321 | 321 | $adminAddress = 'WikiAdmin <' . $wgEmergencyContact . '>'; |
| 322 | | - $editorAddress = $pageeditorUser->getName() . ' <' . $pageeditorUser->getEmail() . '>'; |
| | 322 | + $editorAddress = $name . ' <' . $pageeditorUser->getEmail() . '>'; |
| 323 | 323 | if( $wgEmailNotificationRevealPageEditorAddress |
| 324 | 324 | && ( $pageeditorUser->getEmail() != '' ) |
| 325 | 325 | && $pageeditorUser->getOption( 'enotifrevealaddr' ) ) { |
| — | — | @@ -335,12 +335,11 @@ |
| 336 | 336 | $keys['$PAGEEDITORNAMEANDEMAILADDR'] = $replyto; |
| 337 | 337 | } |
| 338 | 338 | |
| 339 | | - if( $pageeditorUser->isIP( $pageeditorUser->getName() ) ) { |
| | 339 | + if( $pageeditorUser->isIP( $name ) ) { |
| 340 | 340 | #real anon (user:xxx.xxx.xxx.xxx) |
| 341 | | - $subject = str_replace('$PAGEEDITOR_QP', 'anonymous user ' . $pageeditorUser->getName(), $subject); |
| 342 | | - $name = $pageeditorUser->getName(); |
| 343 | 341 | $anon = $name . ' (anonymous user)'; |
| 344 | 342 | $anonUrl = wfUrlencode( $name ) . ' (anonymous user)'; |
| | 343 | + $subject = str_replace('$PAGEEDITOR', 'anonymous user '. $name, $subject); |
| 345 | 344 | |
| 346 | 345 | $keys['$PAGEEDITOR_RAWURL'] = $anonUrl; |
| 347 | 346 | $keys['%24PAGEEDITOR_RAWURL'] = $anonUrl; |
| — | — | @@ -348,13 +347,13 @@ |
| 349 | 348 | $keys['$PAGEEDITORE'] = $anon; |
| 350 | 349 | $keys['$PAGEEDITOR'] = 'anonymous user ' . $name; |
| 351 | 350 | } else { |
| 352 | | - $name = $pageeditorUser->getName(); |
| 353 | | - $subject = str_replace('$PAGEEDITOR_QP', $pageeditor_qp, $subject); |
| | 351 | + $subject = str_replace('$PAGEEDITOR', $name, $subject); |
| 354 | 352 | $keys['$PAGEEDITOR_RAWURL'] = wfUrlencode( $name ); |
| 355 | 353 | $keys['%24PAGEEDITOR_RAWURL'] = wfUrlencode( $name ); |
| 356 | 354 | $keys['%24PAGEEDITORE'] = $pageeditorUser->getTitleKey(); |
| 357 | 355 | $keys['$PAGEEDITORE'] = $pageeditorUser->getTitleKey(); |
| 358 | 356 | $keys['$PAGEEDITOR'] = $pageeditorUser->getName(); |
| | 357 | + $keys['$PAGEEDITOR'] = $name; |
| 359 | 358 | } |
| 360 | 359 | $body = strtr( $body, $keys ); |
| 361 | 360 | |
| — | — | @@ -362,7 +361,7 @@ |
| 363 | 362 | $this->to = $to; |
| 364 | 363 | $this->from = $from; |
| 365 | 364 | $this->replyto = $replyto; |
| 366 | | - $this->subject = $subject; |
| | 365 | + $this->subject = wfQuotedprintable($subject); |
| 367 | 366 | $this->body = $body; |
| 368 | 367 | return $this; |
| 369 | 368 | } |
| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -1243,7 +1243,7 @@ |
| 1244 | 1244 | 'email_notification_reset' => 'Reset all notification flags (set their status to "visited")', |
| 1245 | 1245 | 'email_notification_newpagetext'=> 'This is a new page.', |
| 1246 | 1246 | 'email_notification_to' => '$WATCHINGUSERNAME_QP <$WATCHINGUSEREMAILADDR>', |
| 1247 | | -'email_notification_subject' => '{{SITENAME}} page $PAGETITLE_QP has been changed by $PAGEEDITOR_QP', |
| | 1247 | +'email_notification_subject' => '{{SITENAME}} page $PAGETITLE has been changed by $PAGEEDITOR', |
| 1248 | 1248 | 'email_notification_lastvisitedrevisiontext' => 'See {{SERVER}}{{localurl:$PAGETITLE_RAWURL|diff=0&oldid=$OLDID}} for all changes since your last visit.', |
| 1249 | 1249 | 'email_notification_body' => 'Dear $WATCHINGUSERNAME, |
| 1250 | 1250 | |