https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113407
Revision: 113407
Author: ialex
Date: 2012-03-08 21:39:13 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
* (bug 35019) Fix for rr99942: edit summaries are no longer transformed in
notification e-mails
Modified Paths:
--------------
branches/REL1_19/phase3/RELEASE-NOTES-1.19
branches/REL1_19/phase3/includes/UserMailer.php
trunk/phase3/RELEASE-NOTES-1.19
trunk/phase3/includes/UserMailer.php
Modified: branches/REL1_19/phase3/RELEASE-NOTES-1.19
===================================================================
--- branches/REL1_19/phase3/RELEASE-NOTES-1.19 2012-03-08 21:22:45 UTC (rev
113406)
+++ branches/REL1_19/phase3/RELEASE-NOTES-1.19 2012-03-08 21:39:13 UTC (rev
113407)
@@ -14,6 +14,7 @@
=== Changes since 1.19 beta 1 ===
* (bug 35014) Including a special page no longer sets the page's title to the
included page
+* (bug 35019) Edit summaries are no longer transformed in notification e-mails
=== Configuration changes in 1.19 ===
* Removed SkinTemplateSetupPageCss hook; use BeforePageDisplay instead.
Modified: branches/REL1_19/phase3/includes/UserMailer.php
===================================================================
--- branches/REL1_19/phase3/includes/UserMailer.php 2012-03-08 21:22:45 UTC
(rev 113406)
+++ branches/REL1_19/phase3/includes/UserMailer.php 2012-03-08 21:39:13 UTC
(rev 113407)
@@ -617,6 +617,7 @@
# simply editing the Meta pages
$keys = array();
+ $postTransformKeys = array();
if ( $this->oldid ) {
if ( $wgEnotifImpersonal ) {
@@ -639,7 +640,6 @@
$keys['$PAGETITLE'] = $this->title->getPrefixedText();
$keys['$PAGETITLE_URL'] = $this->title->getCanonicalUrl();
$keys['$PAGEMINOREDIT'] = $this->minorEdit ? wfMsgForContent(
'minoredit' ) : '';
- $keys['$PAGESUMMARY'] = $this->summary == '' ? ' - ' :
$this->summary;
$keys['$UNWATCHURL'] = $this->title->getCanonicalUrl(
'action=unwatch' );
if ( $this->editor->isAnon() ) {
@@ -654,16 +654,20 @@
$keys['$PAGEEDITOR_WIKI'] =
$this->editor->getUserPage()->getCanonicalUrl();
+ # Replace this after transforming the message, bug 35019
+ $postTransformKeys['$PAGESUMMARY'] = $this->summary == '' ? ' -
' : $this->summary;
+
# Now build message's subject and body
$subject = wfMsgExt( 'enotif_subject', 'content' );
$subject = strtr( $subject, $keys );
- $this->subject = MessageCache::singleton()->transform(
$subject, false, null, $this->title );
+ $subject = MessageCache::singleton()->transform( $subject,
false, null, $this->title );
+ $this->subject = strtr( $subject, $postTransformKeys );
$body = wfMsgExt( 'enotif_body', 'content' );
$body = strtr( $body, $keys );
$body = MessageCache::singleton()->transform( $body, false,
null, $this->title );
- $this->body = wordwrap( $body, 72 );
+ $this->body = wordwrap( strtr( $body, $postTransformKeys ), 72
);
# Reveal the page editor's address as REPLY-TO address only if
# the user has not opted-out and the option is enabled at the
Modified: trunk/phase3/RELEASE-NOTES-1.19
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.19 2012-03-08 21:22:45 UTC (rev 113406)
+++ trunk/phase3/RELEASE-NOTES-1.19 2012-03-08 21:39:13 UTC (rev 113407)
@@ -14,6 +14,7 @@
=== Changes since 1.19 beta 1 ===
* (bug 35014) Including a special page no longer sets the page's title to the
included page
+* (bug 35019) Edit summaries are no longer transformed in notification e-mails
=== Configuration changes in 1.19 ===
* Removed SkinTemplateSetupPageCss hook; use BeforePageDisplay instead.
Modified: trunk/phase3/includes/UserMailer.php
===================================================================
--- trunk/phase3/includes/UserMailer.php 2012-03-08 21:22:45 UTC (rev
113406)
+++ trunk/phase3/includes/UserMailer.php 2012-03-08 21:39:13 UTC (rev
113407)
@@ -619,6 +619,7 @@
# simply editing the Meta pages
$keys = array();
+ $postTransformKeys = array();
if ( $this->oldid ) {
// Always show a link to the diff which triggered the
mail. See bug 32210.
@@ -642,7 +643,6 @@
$keys['$PAGETITLE'] = $this->title->getPrefixedText();
$keys['$PAGETITLE_URL'] = $this->title->getCanonicalUrl();
$keys['$PAGEMINOREDIT'] = $this->minorEdit ? wfMsgForContent(
'minoredit' ) : '';
- $keys['$PAGESUMMARY'] = $this->summary == '' ? ' - ' :
$this->summary;
$keys['$UNWATCHURL'] = $this->title->getCanonicalUrl(
'action=unwatch' );
if ( $this->editor->isAnon() ) {
@@ -657,16 +657,20 @@
$keys['$PAGEEDITOR_WIKI'] =
$this->editor->getUserPage()->getCanonicalUrl();
+ # Replace this after transforming the message, bug 35019
+ $postTransformKeys['$PAGESUMMARY'] = $this->summary == '' ? ' -
' : $this->summary;
+
# Now build message's subject and body
$subject = wfMsgExt( 'enotif_subject', 'content' );
$subject = strtr( $subject, $keys );
- $this->subject = MessageCache::singleton()->transform(
$subject, false, null, $this->title );
+ $subject = MessageCache::singleton()->transform( $subject,
false, null, $this->title );
+ $this->subject = strtr( $subject, $postTransformKeys );
$body = wfMsgExt( 'enotif_body', 'content' );
$body = strtr( $body, $keys );
$body = MessageCache::singleton()->transform( $body, false,
null, $this->title );
- $this->body = wordwrap( $body, 72 );
+ $this->body = wordwrap( strtr( $body, $postTransformKeys ), 72
);
# Reveal the page editor's address as REPLY-TO address only if
# the user has not opted-out and the option is enabled at the
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
