Merge pull request SimpleMachines#8838 from jdarwood007/2.1/fix8820

[2.1] Fix quotes in names for mention handling

Author: Sesquipedalian

Sources/Mentions.php

@@ -305,7 +305,7 @@ protected static function getPossibleMentions($body)
 			$count = count($match);
 
 			for ($i = 1; $i <= $count; $i++)
-				$names[] = $smcFunc['htmlspecialchars']($smcFunc['htmltrim'](implode('', array_slice($match, 0, $i))));
+				$names[] = $smcFunc['htmlspecialchars']($smcFunc['htmltrim'](implode('', array_slice($match, 0, $i))), ENT_QUOTES);
 		}
 
 		$names = array_unique($names);

Themes/default/scripts/mentions.js

@@ -43,6 +43,25 @@ var atwhoConfig = {
 					callback(callbackArray);
 				}
 			});
+		},
+		tplEval: function (tpl, map, caller) {
+			var error, error1, template;
+			template = tpl;
+			try {
+			  if (typeof tpl !== 'string') {
+				template = tpl(map);
+			  }
+			  // When SCEditor is disabled, inserted names may contain some HTML if it was escaped.
+			  if (caller == 'onInsert') {
+			  	map['name'] = map['name'].toString().replace(""", '"').replace(''', "'");
+			  }
+			  return template.replace(/\$\{([^\}]*)\}/g, function(tag, key, pos) {
+				return map[key];
+			  });
+			} catch (error1) {
+			  error = error1;
+			  return "";
+			}
 		}
 	}
 };