diff --git a/ecrire/inc/plugin.php b/ecrire/inc/plugin.php index f025c269693a82c710d46423396d666921c69ba3..f0337f2f5a3c26f96e8b4722e9a18f621fe85889 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 813cb5cc47ed996cba262c6b1d329a2796573af3..7587382fe7bb22b8bee286e99801ee74ac64eaac 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 423fc58fbe504a7dcd14480b5f94d2d5d7690f81..795f262acef6ae554b0b36eb39618e007c084a69 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