Removed what seems to be unused strings from composeCommonMailtext(). More work needs...

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 0eb72c6..23a2e0f 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -244,7 +244,6 @@ class EmailNotification {
                # named variables when composing your notification emails while
                # simply editing the Meta pages
                
-               $to      = wfMsgForContent( 'enotif_to' );
                $subject = wfMsgForContent( 'enotif_subject' );
                $body    = wfMsgForContent( 'enotif_body' );
                $from    = ''; /* fail safe */
@@ -273,7 +272,6 @@ class EmailNotification {
                $keys['%24PAGETITLE']        = $pagetitle; # needed for the {{localurl:$PAGETITLE}} in the messagetext, "$" appears here as "%24"
                $keys['$PAGETITLE']          = $pagetitle;
                $keys['$PAGETIMESTAMP']      = $article->mTimestamp;    # this is the raw internal timestamp - can be useful, too
-               $keys['$PAGEEDITDATEUTC']    = $wgLang->timeanddate( $article->mTimestamp, false, false, false );
                $keys['$PAGEMINOREDIT']      = $medit;
                $keys['$PAGESUMMARY']        = $summary;
        
@@ -294,11 +292,9 @@ class EmailNotification {
                                $from    = $adminAddress;
                                $replyto = $editorAddress;
                        }
-                       $keys['$PAGEEDITORNAMEANDEMAILADDR'] = $editorAddress;
                } else {
                        $from    = $adminAddress;
                        $replyto = $wgNoReplyAddress;
-                       $keys['$PAGEEDITORNAMEANDEMAILADDR'] = $replyto;
                }
        
                if( $wgUser->isIP( $name ) ) {
@@ -310,20 +306,17 @@ class EmailNotification {
                        $keys['$PAGEEDITOR_RAWURL']   = $anonUrl;
                        $keys['%24PAGEEDITOR_RAWURL'] = $anonUrl;
                        $keys['%24PAGEEDITORE']       = $anon;
-                       $keys['$PAGEEDITORE']         = $anon;
                        $keys['$PAGEEDITOR']          = 'anonymous user ' . $name;
                } else {
                        $subject = str_replace('$PAGEEDITOR', $name, $subject);
                        $keys['$PAGEEDITOR_RAWURL']   = wfUrlencode( $name );
                        $keys['%24PAGEEDITOR_RAWURL'] = wfUrlencode( $name );
                        $keys['%24PAGEEDITORE']       = $wgUser->getTitleKey();
-                       $keys['$PAGEEDITORE']         = $wgUser->getTitleKey();
                        $keys['$PAGEEDITOR']          = $name;
                }
                $body = strtr( $body, $keys );
        
                # now save this as the constant user-independent part of the message
-               $this->to      = $to;
                $this->from    = $from;
                $this->replyto = $replyto;
                $this->subject = $subject;
@@ -349,7 +342,6 @@ class EmailNotification {
                //     The mail command will not parse this properly while talking with the MTA.
                $to = $watchingUser->getEmail();
                $body = str_replace( '$WATCHINGUSERNAME', $watchingUser->getName() , $this->body );
-               $body = str_replace( '$WATCHINGUSEREMAILADDR', $watchingUser->getEmail(), $body );
        
                $timecorrection = $watchingUser->getOption( 'timecorrection' );
                if( !$timecorrection ) {

diff --git a/languages/Language.php b/languages/Language.php
index dfda3c4..e79a34b 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1256,7 +1256,6 @@ at the bottom of the screen (deleting a content page also deletes the accompanyi
 * Pages which have been changed since you last visited them are shown in '''bold'''",
 'enotif_reset'                 => 'Mark all pages visited',
 'enotif_newpagetext'=> 'This is a new page.',
-'enotif_to'    => '$WATCHINGUSERNAME_QP <$WATCHINGUSEREMAILADDR>',
 'changed'                      => 'changed',
 'created'                      => 'created',
 'enotif_subject'       => '{{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED by $PAGEEDITOR',

diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index 5a4c790..5c0279d 100644 (file)
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -1104,7 +1104,6 @@ $3…
 * Страницы, изменившиеся с момента вашего последнего посещения показаны '''жирным шрифтом''' ",
 'enotif_reset'              => 'Отметить все страницы как просмотренные',
 'enotif_newpagetext'        => 'Это новая страница.',
-'enotif_to'                 => '$WATCHINGUSERNAME_QP <$WATCHINGUSEREMAILADDR>',
 'changed'                       => 'изменена',
 'created'                       => 'создана',
 'enotif_subject'    => 'Страница проекта «{{SITENAME}}» $PAGETITLE была $CHANGEDORCREATED участником $PAGEEDITOR',