Merge branch '5.8.10' of https://github.com/pluxml/PluXml into 5.8.10

pluxml · Mar 23, 2024 · e31d685 · e31d685
2 parents c8ae197 + 0d4b634
commit e31d685
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/core/lib/class.plx.glob.php b/core/lib/class.plx.glob.php
@@ -11,7 +11,7 @@ class plxGlob {
 	const PATTERNS = array(
 		'arts'			=> '#^\D?(\d{4,})\.(?:\w+|\d{3})(?:,\w+|,\d{3})*\.\d{3}\.\d{12}\..*\.xml$#',
 		'statiques'		=> '#^(\d{3,})\..*\.php$#',
-		'commentaires'	=> '#^\d{4,}\.(?:\d{10,})(?:-\d+)?\.xml$#'
+		'commentaires'		=> '#^_?\d{4,}\.(?:\d{10,})(?:-\d+)?\.xml$#'
 	);
 	public $count = 0; # Le nombre de resultats
 	public $aFiles = array(); # Tableau des fichiers

diff --git a/core/lib/class.plx.show.php b/core/lib/class.plx.show.php
@@ -1673,7 +1673,7 @@ public function staticInclude($id)
         # Hook Plugins
         if (eval($this->plxMotor->plxPlugins->callHook('plxShowStaticInclude'))) return;
         # On génère un nouvel objet plxGlob
-        $plxGlob_stats = plxGlob::getInstance(PLX_ROOT . $this->plxMotor->aConf['racine_statiques'], true, 'statiques');
+        $plxGlob_stats = plxGlob::getInstance(PLX_ROOT . $this->plxMotor->aConf['racine_statiques'], false, true, 'statiques');
         if (is_numeric($id)) # inclusion à partir de l'id de la page
             $regx = '/^' . str_pad($id, 3, '0', STR_PAD_LEFT) . '.[a-z0-9-]+.php$/';
         else { # inclusion à partir du titre de la page

diff --git a/core/lib/config.php b/core/lib/config.php
@@ -1,6 +1,6 @@
 <?php
 const PLX_DEBUG = true;
-const PLX_VERSION = '5.8.9';
+const PLX_VERSION = '5.8.10';
 const PLX_URL_REPO = 'https://www.pluxml.org';
 const PLX_URL_VERSION = PLX_URL_REPO.'/download/latest-version.txt';
 

diff --git a/readme/CHANGELOG b/readme/CHANGELOG
@@ -1,3 +1,6 @@
+## PLUXML 5.8.10 (2024/03/18)
+FIX PHP 8+ compatibility 
+
 ## PLUXML 5.8.9 (2022/08/01) ##
 REVERT v5.8.8 FIX Static pages PHP injection vulnerability #558 (P3ter, Moritz Huppert)