floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into standalone_develop

This commit is contained in:
yystopf 2022-06-08 10:47:08 +08:00
parent 8a7dc75907 3e4dd90e17
commit 7a0dbaaefb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/user.rb
View File

@ -567,7 +567,8 @@ class User < Owner
return '游客' unless logged? return '游客' unless logged?
name = lastname + firstname name = lastname + firstname
name = name.blank? ? (nickname.blank? ? login : nickname) : name name = name.blank? ? (nickname.blank? ? login : nickname) : name
name.gsub(/\s+/, '').strip #6.11 -hs # name.gsub(/\s+/, '').strip #6.11 -hs
name.strip
end end
def only_real_name def only_real_name