Merge pull request #7614 from live627/fix/topic-584161

live627 · web-flow · commit 79970ebbe29b · 2022-11-14T15:01:48.000-07:00
fix: Don't confuse mentions and hyperlinks
diff --git a/Themes/default/scripts/jquery.sceditor.smf.js b/Themes/default/scripts/jquery.sceditor.smf.js
@@ -943,7 +943,7 @@ sceditor.formats.bbcode.set(
 			if (typeof attrs.defaultattr === "undefined" || attrs.defaultattr.length === 0)
 				attrs.defaultattr = content;
 
-			return '<a href="' + smf_scripturl +'?action=profile;u='+ attrs.defaultattr + '" class="mention" data-mention="'+ attrs.defaultattr + '">@'+ content.replace('@','') +'</a>';
+			return '<a href="' + smf_scripturl +'?action=profile;u='+ attrs.defaultattr + '" class="mention" data-type="mention" data-mention="'+ attrs.defaultattr + '">@'+ content.replace('@', '') +'</a>';
 		}
 	}
 );

Original file line number	Diff line number	Diff line change
`@@ -943,7 +943,7 @@ sceditor.formats.bbcode.set(`
`943`	`943`	`if (typeof attrs.defaultattr === "undefined" \|\| attrs.defaultattr.length === 0)`
`944`	`944`	`attrs.defaultattr = content;`
`945`	`945`
`946`		`- return '<a href="' + smf_scripturl +'?action=profile;u='+ attrs.defaultattr + '" class="mention" data-mention="'+ attrs.defaultattr + '">@'+ content.replace('@','') +'</a>';`
	`946`	`+ return '<a href="' + smf_scripturl +'?action=profile;u='+ attrs.defaultattr + '" class="mention" data-type="mention" data-mention="'+ attrs.defaultattr + '">@'+ content.replace('@', '') +'</a>';`
`947`	`947`	`}`
`948`	`948`	`}`
`949`	`949`	`);`