blitzwing/bintzwing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-prettyprint-comments'

Browse source
This commit is contained in:
El RIDO 2018-07-01 14:57:05 +02:00
commit 3745f9d96b
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
js/privatebin.js
View file

@ -4128,11 +4128,6 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
var key = Model.getPasteKey(), var key = Model.getPasteKey(),
password = Prompt.getPassword(); password = Prompt.getPassword();
if (PasteViewer.isPrettyPrinted()) {
// don't decrypt twice
return;
}
// try to decrypt the paste // try to decrypt the paste
try { try {
// decrypt attachments // decrypt attachments

2
tpl/bootstrap.php
View file

@ -75,7 +75,7 @@ if ($MARKDOWN):
<?php <?php
endif; endif;
?> ?>
<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-4pwrT1W8ZgMke+LVbfI/pxAVcAljK8ulE8BoAuHASIXWI3bJMEivg+Iwhv7f2cZEsktmAId8Uo/tgoL7FT/4tA==" crossorigin="anonymous"></script> <script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-w/zjLcgT4cJcMplN6yncy2EDu3+hxuto0Flxwa4ShhK2ceO/JRQJglZXB1lD9TLTf9EnwsHnaqh4dt7dGxiMxA==" crossorigin="anonymous"></script>
<!--[if lt IE 10]> <!--[if lt IE 10]>
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style> <style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
<![endif]--> <![endif]-->

2
tpl/page.php
View file

@ -54,7 +54,7 @@ if ($QRCODE):
<?php <?php
endif; endif;
?> ?>
<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-4pwrT1W8ZgMke+LVbfI/pxAVcAljK8ulE8BoAuHASIXWI3bJMEivg+Iwhv7f2cZEsktmAId8Uo/tgoL7FT/4tA==" crossorigin="anonymous"></script> <script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-w/zjLcgT4cJcMplN6yncy2EDu3+hxuto0Flxwa4ShhK2ceO/JRQJglZXB1lD9TLTf9EnwsHnaqh4dt7dGxiMxA==" crossorigin="anonymous"></script>
<!--[if lt IE 10]> <!--[if lt IE 10]>
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style> <style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
<![endif]--> <![endif]-->