diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-05-22 11:11:22 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-05-22 11:11:22 +0100 |
| commit | b58f2d6b2847f5d438468bfdd317308f60d32be3 (patch) | |
| tree | e11cb1c5970b496dd7a11e6870e6b60d0640a174 /app/models | |
| parent | 308707f1512fc43c570023ee786463d37e43f1fb (diff) | |
| parent | 062115762f07826dfebba37af4a4b6d6651034af (diff) | |
Merge branch 'hotfix/0.5.2'0.5.2
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/public_body.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 961fa3cbb..90e9395ae 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -240,7 +240,7 @@ class PublicBody < ActiveRecord::Base # Return the short name if present, or else long name def short_or_long_name if self.short_name.nil? || self.short_name.empty? # 'nil' can happen during construction - self.name + self.name.nil? ? "" : self.name else self.short_name end |