Merge remote-tracking branch 'origin/master'

This commit is contained in:
Andreas N 2015-01-06 15:32:25 +01:00
commit 7b37676be2
1 changed files with 1 additions and 1 deletions

View File

@ -127,7 +127,7 @@ class User < ActiveRecord::Base
end
def display_website
website.match(/https?:\/\/([A-Za-z.\-]+)\/?(?:.*)/i)[1]
website.match(/https?:\/\/([A-Za-z.\-0-9]+)\/?(?:.*)/i)[1]
rescue NoMethodError
website
end