From d12c9e4144548db02196eba5f96cecaa7eeb5654 Mon Sep 17 00:00:00 2001
From: Matthieu Marcillaud <marcimat@rezo.net>
Date: Fri, 2 Nov 2018 14:18:21 +0000
Subject: [PATCH] =?UTF-8?q?Ticket=20#4204=20:=20Compatibilit=C3=A9=20PHP?=
=?UTF-8?q?=207.3.=20La=20librairie=20PCRE=20passe=20en=20v2,=20et=20est?=
=?UTF-8?q?=20moins=20tol=C3=A9rante.=20Le=20caract=C3=A8re=20-,=20indiqu?=
=?UTF-8?q?=C3=A9=20dans=20un=20bloc=20de=20caract=C3=A8res=20`[=20-=20]`,?=
=?UTF-8?q?=20pour=20ne=20pas=20=C3=AAtre=20pris=20pour=20une=20d=C3=A9cla?=
=?UTF-8?q?ration=20d=E2=80=99intervalle=20(comme=20`[a-z]`),=20doit=20?=
=?UTF-8?q?=C3=AAtre=20soit=20=C3=A9chapp=C3=A9=20avec=20\=20soit=20=C3=AA?=
=?UTF-8?q?tre=20en=20t=C3=AAte=20ou=20en=20fin=20de=20la=20structure.=20(?=
=?UTF-8?q?Francky)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/plugins/installer.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ecrire/plugins/installer.php b/ecrire/plugins/installer.php
index 15d81d1c07..294be869df 100644
--- a/ecrire/plugins/installer.php
+++ b/ecrire/plugins/installer.php
@@ -164,8 +164,8 @@ function spip_plugin_install($action, $infos, $version_cible) {
* Avec operateur : bool.
**/
function spip_version_compare($v1, $v2, $op = null) {
- $v1 = strtolower(preg_replace(',([0-9])[\s-.]?(dev|alpha|a|beta|b|rc|pl|p),i', '\\1.\\2', $v1));
- $v2 = strtolower(preg_replace(',([0-9])[\s-.]?(dev|alpha|a|beta|b|rc|pl|p),i', '\\1.\\2', $v2));
+ $v1 = strtolower(preg_replace(',([0-9])[\s.-]?(dev|alpha|a|beta|b|rc|pl|p),i', '\\1.\\2', $v1));
+ $v2 = strtolower(preg_replace(',([0-9])[\s.-]?(dev|alpha|a|beta|b|rc|pl|p),i', '\\1.\\2', $v2));
$v1 = str_replace('rc', 'RC', $v1); // certaines versions de PHP ne comprennent RC qu'en majuscule
$v2 = str_replace('rc', 'RC', $v2); // certaines versions de PHP ne comprennent RC qu'en majuscule
--
GitLab