aboutsummaryrefslogtreecommitdiff
path: root/src/components/poll/poll.js
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2024-03-22 08:17:33 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2024-03-22 08:17:33 +0000
commit23edfe7b918844f8cc2ff5b9b245952092ee1cbf (patch)
tree1f03173caa74258b8becceaa896e732772a48c48 /src/components/poll/poll.js
parent698d6085918c012150a16ffaf24d34970629542d (diff)
parent8562fd2da681497f798fa50eaa449966aa69c483 (diff)
Merge branch 'non-expiring-polls' into 'develop'
Hide the expiry date indication if the poll never expires Closes #961 See merge request pleroma/pleroma-fe!1889
Diffstat (limited to 'src/components/poll/poll.js')
-rw-r--r--src/components/poll/poll.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js
index f6001f56..9ce0e29e 100644
--- a/src/components/poll/poll.js
+++ b/src/components/poll/poll.js
@@ -38,7 +38,7 @@ export default {
return (this.poll && this.poll.options) || []
},
expiresAt () {
- return (this.poll && this.poll.expires_at) || 0
+ return (this.poll && this.poll.expires_at) || null
},
expired () {
return (this.poll && this.poll.expired) || false