Merge branch 'develop' into standalone_develop
This commit is contained in:
commit
7a0dbaaefb
|
@ -567,7 +567,8 @@ class User < Owner
|
|||
return '游客' unless logged?
|
||||
name = lastname + firstname
|
||||
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
|
||||
|
||||
def only_real_name
|
||||
|
|
Loading…
Reference in New Issue