diff options
author | nfoy <nfoy@purdue.edu> | 2014-04-23 22:53:04 -0400 |
---|---|---|
committer | nfoy <nfoy@purdue.edu> | 2014-04-23 22:53:04 -0400 |
commit | a6f801b7f5a2b9ca1b61ecc305a31f76be8c8238 (patch) | |
tree | 6f9fe728220b8d7d08e9da3ac3ac48f3a3128d5b /app/models/remote_username.rb | |
parent | 107f1f65c93cbe118a69e76514327c4862c7d51d (diff) | |
parent | 41a93fad32677e3f351c0e16f0c704cbfbc5404e (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/models/remote_username.rb')
-rw-r--r-- | app/models/remote_username.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/remote_username.rb b/app/models/remote_username.rb index c2c3d20..8c1ce26 100644 --- a/app/models/remote_username.rb +++ b/app/models/remote_username.rb @@ -3,7 +3,11 @@ class RemoteUsername < ActiveRecord::Base belongs_to :user def value - JSON.parse(self.json_value) + begin + return JSON.parse(self.json_value) + rescue + return {} + end end def value=(v) |