Merge branch 'fix-prettyprint-comments'

js/privatebin.js

@@ -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

tpl/bootstrap.php

@@ -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]-->

tpl/page.php

@@ -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]-->