diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f6cc164..341f554e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
# PrivateBin version history
-## 1.6.2 (not yet released)
-* FIXED: English not selectable when languageselection enabled (#1208)
+## 1.6.2 (2023-12-15)
+* FIXED: English not selectable when `languageselection` enabled (#1208)
+* FIXED: SRI mismatch due to cached file having changed (#1207)
## 1.6.1 (2023-12-04)
* ADDED: Right-To-Left (RTL) support for Arabic & Hebrew (#1174)
diff --git a/Makefile b/Makefile
index be8982bf..5b61d9e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
.PHONY: all coverage coverage-js coverage-php doc doc-js doc-php increment sign test test-js test-php help
-CURRENT_VERSION = 1.6.1
-VERSION ?= 1.6.2
+CURRENT_VERSION = 1.6.2
+VERSION ?= 1.6.3
VERSION_FILES = index.php bin/ cfg/ *.md doc/Installation.md css/ i18n/ img/ js/package.json js/privatebin.js lib/ Makefile tpl/ tst/
REGEX_CURRENT_VERSION := $(shell echo $(CURRENT_VERSION) | sed "s/\./\\\./g")
REGEX_VERSION := $(shell echo $(VERSION) | sed "s/\./\\\./g")
diff --git a/README.md b/README.md
index dbb625ed..d4e61dad 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# [![PrivateBin](https://cdn.rawgit.com/PrivateBin/assets/master/images/preview/logoSmall.png)](https://privatebin.info/)
-*Current version: 1.6.1*
+*Current version: 1.6.2*
**PrivateBin** is a minimalist, open source online
[pastebin](https://en.wikipedia.org/wiki/Pastebin)
diff --git a/SECURITY.md b/SECURITY.md
index 01275439..ce11f255 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,8 +4,8 @@
| Version | Supported |
| ------- | ------------------ |
-| 1.6.1 | :heavy_check_mark: |
-| < 1.6.1 | :x: |
+| 1.6.2 | :heavy_check_mark: |
+| < 1.6.2 | :x: |
## Reporting a Vulnerability
diff --git a/bin/administration b/bin/administration
index 0f96c75c..5b4a72fc 100755
--- a/bin/administration
+++ b/bin/administration
@@ -9,7 +9,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin;
diff --git a/css/bootstrap/privatebin.css b/css/bootstrap/privatebin.css
index d1eb5756..94084c48 100644
--- a/css/bootstrap/privatebin.css
+++ b/css/bootstrap/privatebin.css
@@ -6,7 +6,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
body {
diff --git a/css/noscript.css b/css/noscript.css
index d3c7a6d3..b347ba3c 100644
--- a/css/noscript.css
+++ b/css/noscript.css
@@ -6,7 +6,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
/* When there is no script at all other */
diff --git a/css/privatebin.css b/css/privatebin.css
index def613c9..b4e99381 100644
--- a/css/privatebin.css
+++ b/css/privatebin.css
@@ -6,7 +6,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
/* CSS Reset from YUI 3.4.1 (build 4118) - Copyright 2011 Yahoo! Inc. All rights reserved.
diff --git a/doc/Installation.md b/doc/Installation.md
index f6bab4aa..98e57e7d 100644
--- a/doc/Installation.md
+++ b/doc/Installation.md
@@ -201,7 +201,7 @@ CREATE INDEX parent ON prefix_comment(pasteid);
CREATE TABLE prefix_config (
id CHAR(16) NOT NULL, value TEXT, PRIMARY KEY (id)
);
-INSERT INTO prefix_config VALUES('VERSION', '1.6.1');
+INSERT INTO prefix_config VALUES('VERSION', '1.6.2');
```
In **PostgreSQL**, the `data`, `attachment`, `nickname` and `vizhash` columns
diff --git a/index.php b/index.php
index 7c970c6d..0de23e4b 100644
--- a/index.php
+++ b/index.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
// change this, if your php files and data is outside of your webservers document root
diff --git a/js/common.js b/js/common.js
index e3153863..a1f4421a 100644
--- a/js/common.js
+++ b/js/common.js
@@ -12,7 +12,7 @@ global.WebCrypto = require('@peculiar/webcrypto').Crypto;
// application libraries to test
global.$ = global.jQuery = require('./jquery-3.7.0');
global.RawDeflate = require('./rawinflate-0.3').RawDeflate;
-global.zlib = require('./zlib-1.2.13').zlib;
+global.zlib = require('./zlib-1.2.13-1').zlib;
require('./prettify');
global.prettyPrint = window.PR.prettyPrint;
global.prettyPrintOne = window.PR.prettyPrintOne;
diff --git a/js/package.json b/js/package.json
index 224b4d42..6194fbbb 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
{
"name": "privatebin",
- "version": "1.6.1",
+ "version": "1.6.2",
"description": "PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256 bit AES in Galois Counter mode (GCM).",
"main": "privatebin.js",
"directories": {
diff --git a/js/privatebin.js b/js/privatebin.js
index d5d1b9ca..c5ee7fb0 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -6,7 +6,7 @@
* @see {@link https://github.com/PrivateBin/PrivateBin}
* @copyright 2012 Sébastien SAUVAGE ({@link http://sebsauvage.net})
* @license {@link https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License}
- * @version 1.6.1
+ * @version 1.6.2
* @name PrivateBin
* @namespace
*/
diff --git a/js/zlib-1.2.13.js b/js/zlib-1.2.13-1.js
similarity index 100%
rename from js/zlib-1.2.13.js
rename to js/zlib-1.2.13-1.js
diff --git a/lib/Configuration.php b/lib/Configuration.php
index 9fd69be9..9224af9b 100644
--- a/lib/Configuration.php
+++ b/lib/Configuration.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin;
diff --git a/lib/Controller.php b/lib/Controller.php
index 5dd66364..fdb2846e 100644
--- a/lib/Controller.php
+++ b/lib/Controller.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin;
@@ -28,7 +28,7 @@ class Controller
*
* @const string
*/
- const VERSION = '1.6.1';
+ const VERSION = '1.6.2';
/**
* minimal required PHP version
diff --git a/lib/Data/AbstractData.php b/lib/Data/AbstractData.php
index 68d452cd..cadf586a 100644
--- a/lib/Data/AbstractData.php
+++ b/lib/Data/AbstractData.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin\Data;
diff --git a/lib/Data/Database.php b/lib/Data/Database.php
index 4fd25e77..6d597714 100644
--- a/lib/Data/Database.php
+++ b/lib/Data/Database.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin\Data;
diff --git a/lib/Data/Filesystem.php b/lib/Data/Filesystem.php
index 2ac594a4..3ba694ef 100644
--- a/lib/Data/Filesystem.php
+++ b/lib/Data/Filesystem.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin\Data;
diff --git a/lib/Data/S3Storage.php b/lib/Data/S3Storage.php
index a5279c40..fbb0497f 100644
--- a/lib/Data/S3Storage.php
+++ b/lib/Data/S3Storage.php
@@ -4,7 +4,7 @@
*
* an S3 compatible data backend for PrivateBin with CEPH/RadosGW in mind
* see https://docs.ceph.com/en/latest/radosgw/s3/php/
- * based on lib/Data/GoogleCloudStorage.php from PrivateBin version 1.6.1
+ * based on lib/Data/GoogleCloudStorage.php from PrivateBin version 1.6.2
*
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2022 Felix J. Ogris (https://ogris.de/)
diff --git a/lib/Filter.php b/lib/Filter.php
index 919e63a5..6af37f11 100644
--- a/lib/Filter.php
+++ b/lib/Filter.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin;
diff --git a/lib/FormatV2.php b/lib/FormatV2.php
index 7cf24f1f..b9687db0 100644
--- a/lib/FormatV2.php
+++ b/lib/FormatV2.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin;
diff --git a/lib/I18n.php b/lib/I18n.php
index 02ea3f3a..3fed6754 100644
--- a/lib/I18n.php
+++ b/lib/I18n.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin;
diff --git a/lib/Json.php b/lib/Json.php
index 203ad443..5fa818cb 100644
--- a/lib/Json.php
+++ b/lib/Json.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin;
diff --git a/lib/Model.php b/lib/Model.php
index e588f8d1..534cd882 100644
--- a/lib/Model.php
+++ b/lib/Model.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin;
diff --git a/lib/Model/AbstractModel.php b/lib/Model/AbstractModel.php
index 2a184ae6..e5a04057 100644
--- a/lib/Model/AbstractModel.php
+++ b/lib/Model/AbstractModel.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin\Model;
diff --git a/lib/Model/Comment.php b/lib/Model/Comment.php
index 59095e58..e0fd0f5f 100644
--- a/lib/Model/Comment.php
+++ b/lib/Model/Comment.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin\Model;
diff --git a/lib/Model/Paste.php b/lib/Model/Paste.php
index c36ca2c3..eed786f6 100644
--- a/lib/Model/Paste.php
+++ b/lib/Model/Paste.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin\Model;
diff --git a/lib/Persistence/AbstractPersistence.php b/lib/Persistence/AbstractPersistence.php
index 14ecfb01..fad42063 100644
--- a/lib/Persistence/AbstractPersistence.php
+++ b/lib/Persistence/AbstractPersistence.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin\Persistence;
diff --git a/lib/Persistence/PurgeLimiter.php b/lib/Persistence/PurgeLimiter.php
index 8cb0bd7c..b9d1853e 100644
--- a/lib/Persistence/PurgeLimiter.php
+++ b/lib/Persistence/PurgeLimiter.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin\Persistence;
diff --git a/lib/Persistence/ServerSalt.php b/lib/Persistence/ServerSalt.php
index 44870a43..666e50d1 100644
--- a/lib/Persistence/ServerSalt.php
+++ b/lib/Persistence/ServerSalt.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin\Persistence;
diff --git a/lib/Persistence/TrafficLimiter.php b/lib/Persistence/TrafficLimiter.php
index 95eabecd..f29a27b6 100644
--- a/lib/Persistence/TrafficLimiter.php
+++ b/lib/Persistence/TrafficLimiter.php
@@ -8,7 +8,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin\Persistence;
diff --git a/lib/Request.php b/lib/Request.php
index bb0af143..b5feb497 100644
--- a/lib/Request.php
+++ b/lib/Request.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin;
diff --git a/lib/View.php b/lib/View.php
index ad26754d..d125933b 100644
--- a/lib/View.php
+++ b/lib/View.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin;
diff --git a/lib/Vizhash16x16.php b/lib/Vizhash16x16.php
index 4f3aafbc..0e6ce3fc 100644
--- a/lib/Vizhash16x16.php
+++ b/lib/Vizhash16x16.php
@@ -8,7 +8,7 @@
* @link https://sebsauvage.net/wiki/doku.php?id=php:vizhash_gd
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 0.0.5 beta PrivateBin 1.6.1
+ * @version 0.0.5 beta PrivateBin 1.6.2
*/
namespace PrivateBin;
diff --git a/lib/YourlsProxy.php b/lib/YourlsProxy.php
index 26876534..9d226c02 100644
--- a/lib/YourlsProxy.php
+++ b/lib/YourlsProxy.php
@@ -7,7 +7,7 @@
* @link https://github.com/PrivateBin/PrivateBin
* @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
* @license https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version 1.6.1
+ * @version 1.6.2
*/
namespace PrivateBin;
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 41813697..be24e666 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -55,7 +55,7 @@ if ($ZEROBINCOMPATIBILITY) :
-
+
@@ -73,7 +73,7 @@ endif;
?>
-
+
diff --git a/tpl/page.php b/tpl/page.php
index 96696a94..c00462c9 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -34,7 +34,7 @@ if ($ZEROBINCOMPATIBILITY):
-
+
-
+