diff --git a/js/privatebin.js b/js/privatebin.js
index c18bdfea..32ed9681 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -4156,10 +4156,16 @@ jQuery.PrivateBin = (function($, RawDeflate) {
clearAttachmentInput();
$burnAfterReading.prop('checked', burnAfterReadingDefault);
$openDiscussion.prop('checked', openDiscussionDefault);
- if (openDiscussionDefault) $openDiscussionOption.removeClass('buttondisabled');
- if (burnAfterReadingDefault) $burnAfterReadingOption.removeClass('buttondisabled');
+ if (openDiscussionDefault || !burnAfterReadingDefault) $openDiscussionOption.removeClass('buttondisabled');
+ if (burnAfterReadingDefault || !openDiscussionDefault) $burnAfterReadingOption.removeClass('buttondisabled');
- // TODO: reset expiration time
+ pasteExpiration = Model.getExpirationDefault() || pasteExpiration;
+ $('#pasteExpiration>option').each(function() {
+ const $this = $(this);
+ if ($this.val() === pasteExpiration) {
+ $('#pasteExpirationDisplay').text($this.text());
+ }
+ });
};
/**
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 81bc3554..5f2d0382 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -72,7 +72,7 @@ endif;
?>
-
+
diff --git a/tpl/page.php b/tpl/page.php
index c139f9c0..0789680b 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -50,7 +50,7 @@ endif;
?>
-
+