From b92c1fa2af5be565eccebbb720e4fb813487cbdc Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 28 Jan 2009 15:20:29 +0000
Subject: [PATCH] "en finir avec le masquage des erreurs des plugins ?"
---
ecrire/inc/plugin.php | 6 +++---
ecrire/inc/utils.php | 3 ++-
ecrire/inc_version.php | 3 +--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ecrire/inc/plugin.php b/ecrire/inc/plugin.php
index f025c26969..f0337f2f5a 100644
--- a/ecrire/inc/plugin.php
+++ b/ecrire/inc/plugin.php
@@ -314,7 +314,6 @@ function ecrire_plugin_actifs($plugin,$pipe_recherche=false,$operation='raz') {
// charger_plugins_fonctions.php
foreach(array('options','fonctions') as $charge){
$s = "";
- //$s .= "error_reporting(SPIP_ERREUR_REPORT_INCLUDE_PLUGINS);\n";
$splugs = "";
if (is_array($infos)){
foreach($ordre as $p){
@@ -345,7 +344,6 @@ function ecrire_plugin_actifs($plugin,$pipe_recherche=false,$operation='raz') {
}
}
}
- //$s .= "error_reporting(SPIP_ERREUR_REPORT);\n";
if ($charge=='options'){
$s .= "function boutons_plugins(){return unserialize('".str_replace("'","\'",serialize($liste_boutons))."');}\n";
$s .= "function onglets_plugins(){return unserialize('".str_replace("'","\'",serialize($liste_onglets))."');}\n";
@@ -501,7 +499,9 @@ function desinstalle_un_plugin($plug,$infos){
// faire les include qui vont bien
foreach($infos['install'] as $file){
$file = trim($file);
- @include_once(_DIR_PLUGINS."$plug/$file");
+ if (file_exists(_DIR_PLUGINS."$plug/$file")){
+ include_once(_DIR_PLUGINS."$plug/$file");
+ }
}
$prefix_install = $infos['prefix']."_install";
if (function_exists($prefix_install)){
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index 813cb5cc47..7587382fe7 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -109,8 +109,9 @@ function pipeline($action, $val=null) {
spip_log("fichier $charger pas cree");
}
- if ($ok)
+ if ($ok) {
include_once $charger;
+ }
}
// appliquer notre fonction si elle existe
diff --git a/ecrire/inc_version.php b/ecrire/inc_version.php
index 423fc58fbe..795f262ace 100644
--- a/ecrire/inc_version.php
+++ b/ecrire/inc_version.php
@@ -396,11 +396,10 @@ require_once _DIR_RESTREINT . 'base/connect_sql.php';
// Definition personnelles eventuelles
-if (_FILE_OPTIONS) include_once _FILE_OPTIONS;
+if (_FILE_OPTIONS) {include_once _FILE_OPTIONS;}
// Masquer les warning
define('SPIP_ERREUR_REPORT',E_ALL ^ E_NOTICE);
-define('SPIP_ERREUR_REPORT_INCLUDE_PLUGINS',0);
error_reporting(SPIP_ERREUR_REPORT);
// Initialisations critiques non surchargeables par les plugins
--
GitLab