Merge pull request #244 from WildcardSearch/maintenance

3.2.10 Release
WildcardSearch · May 11, 2019 · 604e634 · 604e634
2 parents ce0dd9a + 1a52dd7
commit 604e634
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## MentionMe 3.2.9
+## MentionMe 3.2.10
 
 A plugin for MyBB 1.8.x that allows Twitter-style tagging and integration with [MyAlerts](https://github.com/euantorano/MyAlerts)
 

diff --git a/Upload/inc/plugins/MentionMe/forum.php b/Upload/inc/plugins/MentionMe/forum.php
@@ -28,7 +28,7 @@ function mentionMeParseMessage($message)
 	global $mybb;
 
 	// emails addresses cause issues, strip them before matching
-	$emailRegex = "#\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}\b#i";
+	$emailRegex = "#\b[^@[\"|'|`]][A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}\b#i";
 	preg_match_all($emailRegex, $message, $emails, PREG_SET_ORDER);
 	$message = preg_replace($emailRegex, "<mybb-email>\n", $message);
 

diff --git a/Upload/inc/plugins/mention.php b/Upload/inc/plugins/mention.php
@@ -14,7 +14,7 @@
 
 // checked by other plugin files
 define('IN_MENTIONME', true);
-define('MENTIONME_VERSION', '3.2.9');
+define('MENTIONME_VERSION', '3.2.10');
 
 // register custom class autoloader
 spl_autoload_register('mentionMeClassAutoLoad');