From df73c8663d56f4510adbe218eb15896633927c17 Mon Sep 17 00:00:00 2001
From: cy_altern <cy_altern@gmail.com>
Date: Sun, 11 Dec 2011 14:51:49 +0000
Subject: [PATCH] =?UTF-8?q?gerer=20les=20=5FDIR=5FPLUGINS=5FSUPPL=20sans?=
=?UTF-8?q?=20/=20a=20la=20fin=20plut=C3=B4t=20que=20de=20sortir=20la=20gr?=
=?UTF-8?q?osse=20artillerie...=20(merci=20Cedric=20pour=20le=20KISS!)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc/plugin.php | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/ecrire/inc/plugin.php b/ecrire/inc/plugin.php
index 0936c89563..6a34e8e3f5 100644
--- a/ecrire/inc/plugin.php
+++ b/ecrire/inc/plugin.php
@@ -40,8 +40,8 @@ function liste_plugin_files($dir_plugins = null){
if ($dir_plugins == _DIR_PLUGINS AND defined('_DIR_PLUGINS_SUPPL')) {
$dir_plugins_suppl = array_filter(explode(':',_DIR_PLUGINS_SUPPL));
foreach($dir_plugins_suppl as $suppl) {
- $suppl = _DIR_RACINE.$suppl;
- foreach (fast_find_plugin_dirs($suppl, 100, false) as $plugin) {
+ $suppl = _DIR_RACINE.$suppl.(substr($suppl, -1) != '/' ? '/' : '');
+ foreach (fast_find_plugin_dirs($suppl) as $plugin) {
if (!in_array($plugin, $plugin_files[$dir_plugins]))
$plugin_files[$dir_plugins][] = $plugin;
}
@@ -57,14 +57,13 @@ function liste_plugin_files($dir_plugins = null){
return $plugin_files[$dir_plugins];
}
-function fast_find_plugin_dirs($dir, $max_prof=100, $racine=true) {
+function fast_find_plugin_dirs($dir, $max_prof=100) {
$fichiers = array();
- // si $racine = true revenir au repertoire racine si on a recu dossier/truc
+ // revenir au repertoire racine si on a recu dossier/truc
// pour regarder dossier/truc/ ne pas oublier le / final
- if ($racine) {
- $dir = preg_replace(',/[^/]*$,', '', $dir);
- if ($dir == '') $dir = '.';
- }
+ $dir = preg_replace(',/[^/]*$,', '', $dir);
+ if ($dir == '') $dir = '.';
+
if (!is_dir($dir))
return $fichiers;
if (is_plugin_dir($dir,'')) {
--
GitLab