Pwirth has uploaded a new change for review. https://gerrit.wikimedia.org/r/166730
Change subject: Fixed prepare message with html footer ...................................................................... Fixed prepare message with html footer Change-Id: I6c95d3d30aed40aea56bca78f2ad4188b43cef9b --- M includes/Mailer.class.php 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation refs/changes/30/166730/1 diff --git a/includes/Mailer.class.php b/includes/Mailer.class.php index b29bcaa..3a0a99e 100644 --- a/includes/Mailer.class.php +++ b/includes/Mailer.class.php @@ -108,20 +108,20 @@ $sCombinedSubject = '['.$wgSitename.'] '.$sSubject; //Prepare message - $sFooter = $this->bSendHTML ? wfMessage( 'bs-mail-footer-html', $wgSitename )->plain() : wfMessage( 'bs-mail-footer', $wgSitename )->plain() ; - $sCombinedMsg = $sMsg.$sFooter; - if( $this->bSendHTML ) { //http(s)://link -> <a href="http(s)://link>http(s)://link</a>" //! already followed by </a> //last char ! "." - $sCombinedMsg = preg_replace( + $sMsg = preg_replace( "#(\s|/>)(https?://[^\s]+?)\.?([\s|<])#", '<a href="$2">$2</a>', - $sCombinedMsg + $sMsg ); } + $sFooter = $this->bSendHTML ? wfMessage( 'bs-mail-footer-html', $wgSitename )->plain() : wfMessage( 'bs-mail-footer', $wgSitename )->plain() ; + $sCombinedMsg = $sMsg.$sFooter; + foreach ( $aEmailTo as $aReceiver ) { //Prepare message if ( $aReceiver['greeting'] ) { -- To view, visit https://gerrit.wikimedia.org/r/166730 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c95d3d30aed40aea56bca78f2ad4188b43cef9b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: REL1_22 Gerrit-Owner: Pwirth <wi...@hallowelt.biz> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits