From e7631e7447504fc2d9458d52d7bbfb6ee8e4e246 Mon Sep 17 00:00:00 2001
From: Matthieu Marcillaud <marcimat@rezo.net>
Date: Tue, 21 Mar 2023 21:49:50 +0100
Subject: [PATCH] =?UTF-8?q?remove:=20Inactivation=20des=20filtres=20d?=
=?UTF-8?q?=E2=80=99image=20via=20la=20classe=20`no=5Fimage=5Ffiltrer`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Il y avait écrit "À supprimer en 3.2"… bon…
Utiliser la classe `filtre_inactif`
---
ecrire/inc/filtres.php | 4 ++--
ecrire/inc/filtres_images_mini.php | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ecrire/inc/filtres.php b/ecrire/inc/filtres.php
index 52da091dfd..064be2a522 100644
--- a/ecrire/inc/filtres.php
+++ b/ecrire/inc/filtres.php
@@ -516,8 +516,8 @@ function image_filtrer($args) {
foreach ($tags as $tag) {
$class = extraire_attribut($tag[3], 'class');
if (
- (!$class || !str_contains($class, 'filtre_inactif')
- && !str_contains($class, 'no_image_filtrer')) && ($reduit = $filtre($tag[3], ...$args))
+ (!$class || !str_contains($class, 'filtre_inactif'))
+ && ($reduit = $filtre($tag[3], ...$args))
) {
// En cas de span spip_documents, modifier le style=...width:
if ($tag[1]) {
diff --git a/ecrire/inc/filtres_images_mini.php b/ecrire/inc/filtres_images_mini.php
index 238e2bf889..8035a29c53 100644
--- a/ecrire/inc/filtres_images_mini.php
+++ b/ecrire/inc/filtres_images_mini.php
@@ -318,8 +318,7 @@ function image_select($img, $width_min = 0, $height_min = 0, $width_max = 10000,
$img = inserer_attribut($img, 'class', $class);
}
if ($select == true && $p !== false) {
- // no_image_filtrer : historique, a virer
- $class = preg_replace(',\s*(filtre_inactif|no_image_filtrer),', '', (string) $class);
+ $class = preg_replace(',\s*(filtre_inactif),', '', $class);
$img = inserer_attribut($img, 'class', $class);
}
--
GitLab