Merge pull request #253 from WildcardSearch/maintenance

3.2.12 Release
WildcardSearch · Sep 12, 2019 · a93ca9c · a93ca9c
2 parents 75c01a8 + 79e204a
commit a93ca9c
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## MentionMe 3.2.11
+## MentionMe 3.2.12
 
 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
@@ -37,7 +37,7 @@ function mentionMeParseMessage($message)
 	 *
 	 * quoted
 	 */
-	$message = preg_replace_callback('#@([\'|"|`])(?P<quoted>[^<>&\\\;,\n]+?)\1#u', 'mentionDetect', $message);
+	$message = preg_replace_callback('#@([\'|"|`](?!\s))(?P<quoted>[^<>&\\\;,\n]+?)\1#u', 'mentionDetect', $message);
 
 	/**
 	 * unquoted

diff --git a/Upload/inc/plugins/MentionMe/install.php b/Upload/inc/plugins/MentionMe/install.php
@@ -253,7 +253,7 @@ function mention_uninstall()
 	$db->delete_query('tasks', "file='mentiome_namecache'");
 
 	// undo changes to MyAlerts if installed
-	if ($db->table_exists('alerts')) {
+	if (function_exists('myalerts_info')) {
 		$alertTypeManager = MybbStuff_MyAlerts_AlertTypeManager::getInstance();
 
 		if (!$alertTypeManager) {
@@ -423,7 +423,7 @@ function mentionMeMyAlertsIntegrate()
 		$lang->load('mention');
 	}
 
-	if (!function_exists("myalerts_info")) {
+	if (!function_exists('myalerts_info')) {
 		return;
 	}
 

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.11');
+define('MENTIONME_VERSION', '3.2.12');
 
 // register custom class autoloader
 spl_autoload_register('mentionMeClassAutoLoad');

diff --git a/Upload/jscripts/MentionMe/autocomplete.js b/Upload/jscripts/MentionMe/autocomplete.js
@@ -1147,6 +1147,16 @@ var MentionMe = (function($, m) {
 				left = coords.left + 3,
 				top = coords.top - 5;
 
+			if (typeof m.customTextAreaContainerOffset !== "undefined") {
+				if (typeof m.customTextAreaContainerOffset.left !== "undefined") {
+					left = pi(m.customTextAreaContainerOffset.left);
+				}
+
+				if (typeof m.customTextAreaContainerOffset.top !== "undefined") {
+					top = pi(m.customTextAreaContainerOffset.top);
+				}
+			}
+
 			this.popup.show(left, top);
 		}
 
@@ -1353,6 +1363,16 @@ var MentionMe = (function($, m) {
 				}),
 				containerOffset = this.$container.offset();
 
+			if (typeof m.customSCEditorContainerOffset !== "undefined") {
+				if (typeof m.customSCEditorContainerOffset.left !== "undefined") {
+					containerOffset.left = pi(m.customSCEditorContainerOffset.left);
+				}
+
+				if (typeof m.customSCEditorContainerOffset.top !== "undefined") {
+					containerOffset.top = pi(m.customSCEditorContainerOffset.top);
+				}
+			}
+
 			fontSize = 7;
 			if (this.$currentNode.closest("div").length &&
 				typeof this.$currentNode.closest("div").css === "function") {