mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-03 23:17:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'v1.1.1'

Browse Source 
# Conflicts:
#	js/dist/forum.js
#	js/dist/forum.js.map
This commit is contained in:
SychO9
2021-10-18 20:49:03 +01:00
parent e63f030094 f1f6da10fd
commit ffd982df7f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/mentions/CHANGELOG.md
View File

@@ -1,5 +1,10 @@
# Changelog # Changelog
## [1.1.1](https://github.com/flarum/mentions/compare/v1.1.0...v1.1.1)
### Fixed
- Broken autocompleted user mention format (https://github.com/flarum/mentions/pull/74)
## [1.1.0](https://github.com/flarum/mentions/compare/v1.0.0...v1.1.0) ## [1.1.0](https://github.com/flarum/mentions/compare/v1.0.0...v1.1.0)
### Changed ### Changed

2
extensions/mentions/js/src/forum/utils/getMentionText.js
View File

@@ -27,7 +27,7 @@ export default function getMentionText(user, postId) {
} }
// @"Display name"#UserID // @"Display name"#UserID
const cleanText = getCleanDisplayName(user); const cleanText = getCleanDisplayName(user);
return `@"${cleanText}"${user.id()}`; return `@"${cleanText}"#${user.id()}`;
} else { } else {
// @"Display name"#pPostID // @"Display name"#pPostID
const cleanText = getCleanDisplayName(user); const cleanText = getCleanDisplayName(user);