diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d36aa4..7db04b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+# Under development: [FlatPress 1.3](https://github.com/flatpressblog/flatpress/releases/tag/1.3)
+## General
+- Added [SECURITY.md](https://github.com/flatpressblog/flatpress/blob/master/SECURITY.md)
+- [README](https://github.com/flatpressblog/flatpress/blob/master/README.md): added "help and support" section
+
+## Plugins
+- Gallery captions plugin added (see [#108](https://github.com/flatpressblog/flatpress/issues/108))
+- PhotoSwipe plugin added (see [#109](https://github.com/flatpressblog/flatpress/issues/109))
+- jQuery plugin: Updated jQuery (3.5.1 => 3.6) and jQueryUI (1.12.1 => 1.13)
+
+## Themes
+- Leggero theme: Fixed searchbox glitch in FlatMaas revisited style (see [#97](https://github.com/flatpressblog/flatpress/issues/97))
+- Leggero theme: Fixed missing bullets in preview (see [#98](https://github.com/flatpressblog/flatpress/issues/98))
+- Leggero theme: CSS of the Leggero style had some glitches on mobile devices
+- Leggero theme: Invalid HTML output fixed (see [#106](https://github.com/flatpressblog/flatpress/issues/106))
+
+## Bugfixes
+- Comment Center config page threw errors (see [#90](https://github.com/flatpressblog/flatpress/issues/90))
+- Fixed glitches in Spanish an Portuguese language files
+- Plugin management page: Removed empty warning messages box
+- Fixed wrong pt-br country code (see [#100](https://github.com/flatpressblog/flatpress/issues/100))
+- Fixed error at prev link on first / next link on last entry (see [#95](https://github.com/flatpressblog/flatpress/issues/95))
+
+## Security
+- Fixed security issue reported by huntr.dev: Session cookie missed the "secure" flag
+
# 2021-06-19: [FlatPress 1.2.1](https://github.com/flatpressblog/flatpress/releases/tag/1.2.1)
## Bugfixes
- BOM in French language files lead to blank page in admin area (see [#82](https://github.com/flatpressblog/flatpress/issues/82))
diff --git a/admin/admin-inline.tpl b/admin/admin-inline.tpl
index 648f24a..926b8e2 100644
--- a/admin/admin-inline.tpl
+++ b/admin/admin-inline.tpl
@@ -1,4 +1,4 @@
-
+
{$flatpress.title}{$pagetitle}
diff --git a/admin/index.php b/admin/index.php
index db0b4f9..eeee52f 100755
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,10 +1,9 @@
-
+
FlatPress
diff --git a/admin/panels/entry/admin.entry.commentlist.tpl b/admin/panels/entry/admin.entry.commentlist.tpl
index 7f3f8df..59b54d7 100755
--- a/admin/panels/entry/admin.entry.commentlist.tpl
+++ b/admin/panels/entry/admin.entry.commentlist.tpl
@@ -3,7 +3,7 @@
{entry}
{comment_block}
{html_form}
-
+ * echo '
* ';
*
* }
@@ -105,7 +105,9 @@ class admin_plugin_default extends AdminPanelAction {
function main() {
// $conf = io_load_file(CONFIG_DIR . 'plugins.conf.php');
- $this->smarty->assign('warnings', $this->errors);
+ if (!empty($this->errors)) {
+ $this->smarty->assign('warnings', $this->errors);
+ }
$this->smarty->assign('enabledlist', $this->fp_plugins);
lang_load('admin.plugin');
diff --git a/admin/panels/widgets/admin.widgets.default.php b/admin/panels/widgets/admin.widgets.default.php
index d3b60cf..5c58d85 100644
--- a/admin/panels/widgets/admin.widgets.default.php
+++ b/admin/panels/widgets/admin.widgets.default.php
@@ -1,124 +1,107 @@
';
- }
- add_action('wp_footer', 'admin_widgets_head');
-
-
- class admin_widgets_default extends AdminPanelAction {
-
- //var $validators = array(array('content', 'content', 'notEmpty', false, false));
- var $events = array('save');
-
-
- function get_widget_lists($wlist, $wpos, &$widget_list, $registered_w, $add_empties) {
-
- if (!isset($wlist[$wpos]))
- return;
-
- $widget_list[$wpos] = array();
-
- foreach($wlist[$wpos] as $idx => $wdg) {
-
- $widget_list[$wpos][$idx] = array();
-
- $newid = $wdg; # @list($newid, $params) = explode(":", $wdg);
-
- $widget_list[$wpos][$idx]['id'] = $newid;
-
-
- if (isset($registered_w[$newid])){
- $thiswdg = $registered_w[$newid];
-
- $widget_list[$wpos][$idx]['name'] = $thiswdg['name'];
-
- if ($thiswdg['nparams'] > 0) {
- $widget_list[$wpos][$idx]['params'] = $params;
- }
-
- /*
- * here should go the check for
- * limited parameters: parameters limited to a
- * particular set would mean using a