From 267eeca9d1cf5e1511df9970646af96a1d1da910 Mon Sep 17 00:00:00 2001 From: Jean-Christian Denis Date: Thu, 19 Oct 2023 21:43:45 +0200 Subject: [PATCH] update latest dc2.28 changes --- CHANGELOG.md | 6 ++++++ README.md | 11 +++++------ _define.php | 2 +- dcstore.xml | 4 ++-- src/Target/AuthorMode.php | 5 ++--- src/Target/Other.php | 10 ++++------ 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d11242e..5f8df1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +noodles 1.2.2 - 2023.10.19 +=========================================================== +* Require Dotclear 2.28 +* Require PHP 8.1 +* Upgrade to last minute change to Dotclear 2.28 + noodles 1.2.1 - 2023.10.13 =========================================================== * Require Dotclear 2.28 diff --git a/README.md b/README.md index 60023bb..c4b69ed 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # README -[![Release](https://img.shields.io/badge/release-1.2.1-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/noodles/releases) -![Date](https://img.shields.io/badge/date-2023.10.13-c44d58.svg) +[![Release](https://img.shields.io/badge/release-1.2.2-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/noodles/releases) +![Date](https://img.shields.io/badge/date-2023.10.19-c44d58.svg) [![Dotclear](https://img.shields.io/badge/dotclear-v2.28-137bbb.svg)](https://fr.dotclear.org/download) -[![Dotaddict](https://img.shields.io/badge/dotaddict-official-9ac123.svg)](https://plugins.dotaddict.org/dc2/details/oodles) -[![License](https://img.shields.io/github/license/JcDenis/noodles)](https://git.dotclear.watch/JcDenis/noodles/blob/master/LICENSE) +[![Dotaddict](https://img.shields.io/badge/dotaddict-official-9ac123.svg)](https://plugins.dotaddict.org/dc2/details/noodles) +[![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/JcDenis/noodles/src/branch/master/LICENSE) ## ABOUT @@ -16,7 +16,7 @@ _noodles_ is a plugin for the open-source web publishing software called [Dotcle * Dotclear 2.28 * PHP 8.1+ -* Permissions admin +* Dotclear admin permissions ## USAGE @@ -33,7 +33,6 @@ go to ''configure plugin'', fill in form. * [Sources & contributions](https://git.dotclear.watch/JcDenis/noodles) (or on [GitHub](https://github.com/JcDenis/noodles)) * [Issues & security](https://git.dotclear.watch/JcDenis/noodles/issues) (or on [GitHub](https://github.com/JcDenis/noodles/issues)) - ## CONTRIBUTORS * Jean-Christian Denis (author) diff --git a/_define.php b/_define.php index 8d92298..aea7434 100644 --- a/_define.php +++ b/_define.php @@ -17,7 +17,7 @@ $this->registerModule( 'Noodles', 'Add users gravatars everywhere', 'Jean-Christian Denis and contributors', - '1.2.1', + '1.2.2', [ 'requires' => [['core', '2.28']], 'permissions' => 'My', diff --git a/dcstore.xml b/dcstore.xml index 0e0c78a..0a3108c 100644 --- a/dcstore.xml +++ b/dcstore.xml @@ -2,10 +2,10 @@ Noodles - 1.2.1 + 1.2.2 Jean-Christian Denis and contributors Add users gravatars everywhere - https://git.dotclear.watch/JcDenis/noodles/releases/download/v1.2.1/plugin-noodles.zip + https://git.dotclear.watch/JcDenis/noodles/releases/download/v1.2.2/plugin-noodles.zip 2.28 https://git.dotclear.watch/JcDenis/noodles/src/branch/master/README.md https://git.dotclear.watch/JcDenis/noodles/issues diff --git a/src/Target/AuthorMode.php b/src/Target/AuthorMode.php index 1541c8b..1a08b0e 100644 --- a/src/Target/AuthorMode.php +++ b/src/Target/AuthorMode.php @@ -51,14 +51,13 @@ class AuthorMode $target = $targets->get('author'); if (is_null($target) - || !isset(App::frontend()->ctx) || !App::blog()->isDefined() - || App::frontend()->ctx->__get('current_tpl') != 'author.html' + || App::frontend()->context()->__get('current_tpl') != 'author.html' ) { return; } - $u = App::frontend()->ctx->__get('users'); + $u = App::frontend()->context()->__get('users'); if (!($u instanceof MetaRecord)) { return; } diff --git a/src/Target/Other.php b/src/Target/Other.php index b4b0268..12a236a 100644 --- a/src/Target/Other.php +++ b/src/Target/Other.php @@ -39,14 +39,13 @@ class Other $target = $targets->get('posts'); if (is_null($target) - || !isset(App::frontend()->ctx) || !App::blog()->isDefined() - || App::frontend()->ctx->__get('current_tpl') != 'post.html' + || App::frontend()->context()->__get('current_tpl') != 'post.html' ) { return; } - $m = App::frontend()->ctx->__get('posts'); + $m = App::frontend()->context()->__get('posts'); if (!($m instanceof MetaRecord)) { return; } @@ -79,14 +78,13 @@ class Other $target = $targets->get('comments'); if (is_null($target) - || !isset(App::frontend()->ctx) || !App::blog()->isDefined() - || App::frontend()->ctx->__get('current_tpl') != 'post.html' + || App::frontend()->context()->__get('current_tpl') != 'post.html' ) { return; } - $m = App::frontend()->ctx->__get('comments'); + $m = App::frontend()->context()->__get('comments'); if (!($m instanceof MetaRecord)) { return; }