diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-10-13 16:29:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-13 16:29:17 +0200 |
| commit | ebf2c3195615bb524f6908e84f99887c8775cbc3 (patch) | |
| tree | b393f2b0e0f5735338e495b1efe769ef97265e8c /app/models | |
| parent | 022006577027ca040f4411489821f2e3311f0db6 (diff) | |
| parent | 5169b374c64ee48a820c04d7c6e7f1f9235d2417 (diff) | |
Merge pull request #1620 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/media_attachment.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index a80087fa3..14e6cabae 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -217,7 +217,7 @@ class MediaAttachment < ApplicationRecord end def to_param - shortcode + shortcode.presence || id&.to_s end def focus=(point) |