| Index: trunk/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -14,6 +14,7 @@ |
| 15 | 15 | === Changes since 1.19 beta 1 === |
| 16 | 16 | * (bug 35014) Including a special page no longer sets the page's title to the |
| 17 | 17 | included page |
| | 18 | +* (bug 35019) Edit summaries are no longer transformed in notification e-mails |
| 18 | 19 | |
| 19 | 20 | === Configuration changes in 1.19 === |
| 20 | 21 | * Removed SkinTemplateSetupPageCss hook; use BeforePageDisplay instead. |
| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -619,6 +619,7 @@ |
| 620 | 620 | # simply editing the Meta pages |
| 621 | 621 | |
| 622 | 622 | $keys = array(); |
| | 623 | + $postTransformKeys = array(); |
| 623 | 624 | |
| 624 | 625 | if ( $this->oldid ) { |
| 625 | 626 | // Always show a link to the diff which triggered the mail. See bug 32210. |
| — | — | @@ -642,7 +643,6 @@ |
| 643 | 644 | $keys['$PAGETITLE'] = $this->title->getPrefixedText(); |
| 644 | 645 | $keys['$PAGETITLE_URL'] = $this->title->getCanonicalUrl(); |
| 645 | 646 | $keys['$PAGEMINOREDIT'] = $this->minorEdit ? wfMsgForContent( 'minoredit' ) : ''; |
| 646 | | - $keys['$PAGESUMMARY'] = $this->summary == '' ? ' - ' : $this->summary; |
| 647 | 647 | $keys['$UNWATCHURL'] = $this->title->getCanonicalUrl( 'action=unwatch' ); |
| 648 | 648 | |
| 649 | 649 | if ( $this->editor->isAnon() ) { |
| — | — | @@ -657,16 +657,20 @@ |
| 658 | 658 | |
| 659 | 659 | $keys['$PAGEEDITOR_WIKI'] = $this->editor->getUserPage()->getCanonicalUrl(); |
| 660 | 660 | |
| | 661 | + # Replace this after transforming the message, bug 35019 |
| | 662 | + $postTransformKeys['$PAGESUMMARY'] = $this->summary == '' ? ' - ' : $this->summary; |
| | 663 | + |
| 661 | 664 | # Now build message's subject and body |
| 662 | 665 | |
| 663 | 666 | $subject = wfMsgExt( 'enotif_subject', 'content' ); |
| 664 | 667 | $subject = strtr( $subject, $keys ); |
| 665 | | - $this->subject = MessageCache::singleton()->transform( $subject, false, null, $this->title ); |
| | 668 | + $subject = MessageCache::singleton()->transform( $subject, false, null, $this->title ); |
| | 669 | + $this->subject = strtr( $subject, $postTransformKeys ); |
| 666 | 670 | |
| 667 | 671 | $body = wfMsgExt( 'enotif_body', 'content' ); |
| 668 | 672 | $body = strtr( $body, $keys ); |
| 669 | 673 | $body = MessageCache::singleton()->transform( $body, false, null, $this->title ); |
| 670 | | - $this->body = wordwrap( $body, 72 ); |
| | 674 | + $this->body = wordwrap( strtr( $body, $postTransformKeys ), 72 ); |
| 671 | 675 | |
| 672 | 676 | # Reveal the page editor's address as REPLY-TO address only if |
| 673 | 677 | # the user has not opted-out and the option is enabled at the |
| Index: branches/REL1_19/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -14,6 +14,7 @@ |
| 15 | 15 | === Changes since 1.19 beta 1 === |
| 16 | 16 | * (bug 35014) Including a special page no longer sets the page's title to the |
| 17 | 17 | included page |
| | 18 | +* (bug 35019) Edit summaries are no longer transformed in notification e-mails |
| 18 | 19 | |
| 19 | 20 | === Configuration changes in 1.19 === |
| 20 | 21 | * Removed SkinTemplateSetupPageCss hook; use BeforePageDisplay instead. |
| Index: branches/REL1_19/phase3/includes/UserMailer.php |
| — | — | @@ -617,6 +617,7 @@ |
| 618 | 618 | # simply editing the Meta pages |
| 619 | 619 | |
| 620 | 620 | $keys = array(); |
| | 621 | + $postTransformKeys = array(); |
| 621 | 622 | |
| 622 | 623 | if ( $this->oldid ) { |
| 623 | 624 | if ( $wgEnotifImpersonal ) { |
| — | — | @@ -639,7 +640,6 @@ |
| 640 | 641 | $keys['$PAGETITLE'] = $this->title->getPrefixedText(); |
| 641 | 642 | $keys['$PAGETITLE_URL'] = $this->title->getCanonicalUrl(); |
| 642 | 643 | $keys['$PAGEMINOREDIT'] = $this->minorEdit ? wfMsgForContent( 'minoredit' ) : ''; |
| 643 | | - $keys['$PAGESUMMARY'] = $this->summary == '' ? ' - ' : $this->summary; |
| 644 | 644 | $keys['$UNWATCHURL'] = $this->title->getCanonicalUrl( 'action=unwatch' ); |
| 645 | 645 | |
| 646 | 646 | if ( $this->editor->isAnon() ) { |
| — | — | @@ -654,16 +654,20 @@ |
| 655 | 655 | |
| 656 | 656 | $keys['$PAGEEDITOR_WIKI'] = $this->editor->getUserPage()->getCanonicalUrl(); |
| 657 | 657 | |
| | 658 | + # Replace this after transforming the message, bug 35019 |
| | 659 | + $postTransformKeys['$PAGESUMMARY'] = $this->summary == '' ? ' - ' : $this->summary; |
| | 660 | + |
| 658 | 661 | # Now build message's subject and body |
| 659 | 662 | |
| 660 | 663 | $subject = wfMsgExt( 'enotif_subject', 'content' ); |
| 661 | 664 | $subject = strtr( $subject, $keys ); |
| 662 | | - $this->subject = MessageCache::singleton()->transform( $subject, false, null, $this->title ); |
| | 665 | + $subject = MessageCache::singleton()->transform( $subject, false, null, $this->title ); |
| | 666 | + $this->subject = strtr( $subject, $postTransformKeys ); |
| 663 | 667 | |
| 664 | 668 | $body = wfMsgExt( 'enotif_body', 'content' ); |
| 665 | 669 | $body = strtr( $body, $keys ); |
| 666 | 670 | $body = MessageCache::singleton()->transform( $body, false, null, $this->title ); |
| 667 | | - $this->body = wordwrap( $body, 72 ); |
| | 671 | + $this->body = wordwrap( strtr( $body, $postTransformKeys ), 72 ); |
| 668 | 672 | |
| 669 | 673 | # Reveal the page editor's address as REPLY-TO address only if |
| 670 | 674 | # the user has not opted-out and the option is enabled at the |