chalec
/
ctrlv-privatebin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PrivateBin/PrivateBin

This commit is contained in:
rugk 2018-07-01 14:59:51 +02:00
parent 60d4ccb02c 3745f9d96b
commit 8386141322
No known key found for this signature in database
GPG Key ID: 05D40A636AFAB34D
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(),
password = Prompt.getPassword();
if (PasteViewer.isPrettyPrinted()) {
// don't decrypt twice
return;
}
// try to decrypt the paste
try {
// decrypt attachments

2
tpl/bootstrap.php
View File

@ -75,7 +75,7 @@ if ($MARKDOWN):
<?php
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]>
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
<![endif]-->

2
tpl/page.php
View File

@ -54,7 +54,7 @@ if ($QRCODE):
<?php
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]>
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
<![endif]-->