use last minute changes from Dotclear 2.28

This commit is contained in:
Jean-Christian Denis 2023-11-04 11:09:01 +01:00
parent 726c973ec2
commit 3dea931228
Signed by: JcDenis
GPG key ID: 1B5B8C5B90B6C951
6 changed files with 16 additions and 10 deletions

View file

@ -1,3 +1,9 @@
cinecturlink2 2.3.1 - 2023.11.04
===========================================================
* Require Dotclear 2.28
* Require PHP 8.1
* Use last minute changes from Dotclear 2.28
cinecturlink2 2.3 - 2023.10.23 cinecturlink2 2.3 - 2023.10.23
=========================================================== ===========================================================
* Require Dotclear 2.28 * Require Dotclear 2.28

View file

@ -1,7 +1,7 @@
# README # README
[![Release](https://img.shields.io/badge/release-2.3-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/cinecturlink2/releases) [![Release](https://img.shields.io/badge/release-2.3.1-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/cinecturlink2/releases)
![Date](https://img.shields.io/badge/date-2023.10.23-c44d58.svg)] ![Date](https://img.shields.io/badge/date-2023.11.04-c44d58.svg)]
[![Dotclear](https://img.shields.io/badge/dotclear-v2.28-137bbb.svg)](https://fr.dotclear.org/download) [![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/cinecturlink2) [![Dotaddict](https://img.shields.io/badge/dotaddict-official-9ac123.svg)](https://plugins.dotaddict.org/dc2/details/cinecturlink2)
[![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/JcDenis/cinecturlink2/src/branch/master/LICENSE) [![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/JcDenis/cinecturlink2/src/branch/master/LICENSE)

View file

@ -21,7 +21,7 @@ $this->registerModule(
'Cinecturlink 2', 'Cinecturlink 2',
'Widgets and pages about books, musics, films, blogs you are interested in', 'Widgets and pages about books, musics, films, blogs you are interested in',
'Jean-Christian Denis and Contributors', 'Jean-Christian Denis and Contributors',
'2.3', '2.3.1',
[ [
'requires' => [['core', '2.28']], 'requires' => [['core', '2.28']],
'settings' => ['blog' => '#params.' . basename(__DIR__) . '_params'], 'settings' => ['blog' => '#params.' . basename(__DIR__) . '_params'],

View file

@ -2,10 +2,10 @@
<modules xmlns:da="http://dotaddict.org/da/"> <modules xmlns:da="http://dotaddict.org/da/">
<module id="cinecturlink2"> <module id="cinecturlink2">
<name>Cinecturlink 2</name> <name>Cinecturlink 2</name>
<version>2.3</version> <version>2.3.1</version>
<author>Jean-Christian Denis and Contributors</author> <author>Jean-Christian Denis and Contributors</author>
<desc>Widgets and pages about books, musics, films, blogs you are interested in</desc> <desc>Widgets and pages about books, musics, films, blogs you are interested in</desc>
<file>https://git.dotclear.watch/JcDenis/cinecturlink2/releases/download/v2.3/plugin-cinecturlink2.zip</file> <file>https://git.dotclear.watch/JcDenis/cinecturlink2/releases/download/v2.3.1/plugin-cinecturlink2.zip</file>
<da:dcmin>2.28</da:dcmin> <da:dcmin>2.28</da:dcmin>
<da:details>https://git.dotclear.watch/JcDenis/cinecturlink2/src/branch/master/README.md</da:details> <da:details>https://git.dotclear.watch/JcDenis/cinecturlink2/src/branch/master/README.md</da:details>
<da:support>https://git.dotclear.watch/JcDenis/cinecturlink2/issues</da:support> <da:support>https://git.dotclear.watch/JcDenis/cinecturlink2/issues</da:support>

View file

@ -165,8 +165,7 @@ class BackendListingLinks extends Listing
$this->userColumns(My::id(), $cols); $this->userColumns(My::id(), $cols);
return return (new Para('p' . $row->link_id, 'tr'))
(new Para('p' . $row->link_id, 'tr'))
->class('line') ->class('line')
->items(iterator_to_array($cols)); ->items(iterator_to_array($cols));
} }

View file

@ -6,7 +6,6 @@ namespace Dotclear\Plugin\cinecturlink2;
use Dotclear\App; use Dotclear\App;
use Dotclear\Core\Frontend\Url; use Dotclear\Core\Frontend\Url;
use Dotclear\Helper\File\Path;
/** /**
* @brief cinecturlink2 frontend URLclass. * @brief cinecturlink2 frontend URLclass.
@ -27,8 +26,10 @@ class FrontendUrl extends Url
} }
$tplset = App::themes()->getDefine(App::blog()->settings()->get('system')->get('theme'))->get('tplset'); $tplset = App::themes()->getDefine(App::blog()->settings()->get('system')->get('theme'))->get('tplset');
$tpldir = Path::real(App::plugins()->getDefine(My::id())->get('root')) . DIRECTORY_SEPARATOR . App::frontend()::TPL_ROOT . DIRECTORY_SEPARATOR; if (empty($tplset) || !is_dir(implode(DIRECTORY_SEPARATOR, [My::path(), 'default-templates', $tplset]))) {
App::frontend()->template()->setPath(App::frontend()->template()->getPath(), $tpldir . (!empty($tplset) && is_dir($tpldir . $tplset) ? $tplset : App::config()->defaultTplset())); $tplset = App::config()->defaultTplset();
}
App::frontend()->template()->appendPath(implode(DIRECTORY_SEPARATOR, [My::path(), 'default-templates', $tplset]));
$params = []; $params = [];