Merge pull request #4356 from pjmatos/patch-3

Michael Babker · Michael Babker · commit 2b3469f08887 · 2014-09-29T10:56:17.000-04:00
Email cloak broken when link parameters are not parsed (backport #4354)
diff --git a/plugins/content/emailcloak/emailcloak.php b/plugins/content/emailcloak/emailcloak.php
@@ -45,8 +45,7 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
 	 * @return	string	A regular expression that matches a link containing the parameters.
 	 */
 	protected function _getPattern ($link, $text) {
-		$pattern = '~(?:<a ([\w "\'=\@\.\-:;]*)href\s*=\s*"mailto:'
-			. $link . '"([\w "\'=\@\.\-:;]*))>' . $text . '</a>~i';
+		$pattern = '~(?:<a ([^>]*)href\s*=\s*"mailto:' . $link . '"([^>]*))>' . $text . '</a>~i';
 		return $pattern;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,7 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)`
`45`	`45`	`* @return string A regular expression that matches a link containing the parameters.`
`46`	`46`	`*/`
`47`	`47`	`protected function _getPattern ($link, $text) {`
`48`		`- $pattern = '~(?:<a ([\w "\'=\@\.\-:;])href\s=\s*"mailto:'`
`49`		`- . $link . '"([\w "\'=\@\.\-:;]*))>' . $text . '</a>~i';`
	`48`	`+ $pattern = '~(?:<a ([^>])href\s=\s"mailto:' . $link . '"([^>]))>' . $text . '</a>~i';`
`50`	`49`	`return $pattern;`
`51`	`50`	`}`
`52`	`51`