diff --git a/ecrire/exec/articles_ortho.php b/ecrire/exec/articles_ortho.php index efd813ff3c337129e9144931ac1e156e4eb09d98..5f64593e1565f1b848cd016e08964f31d0a9628b 100644 --- a/ecrire/exec/articles_ortho.php +++ b/ecrire/exec/articles_ortho.php @@ -86,7 +86,7 @@ $ortho = ""; // function debut_html($titre = "", $rubrique="") { - include_ecrire('inc_headers'); + include_spip('inc/headers'); global $browser_verifForm; $nom_site_spip = entites_html(textebrut(typo($GLOBALS['meta']["nom_site"]))); diff --git a/ecrire/exec/convert_utf8.php b/ecrire/exec/convert_utf8.php index d594b131cd70f67732a5f407656f1ae6a30f167e..38d26cac63b4acfba7ed272baa69d39788bba37a 100644 --- a/ecrire/exec/convert_utf8.php +++ b/ecrire/exec/convert_utf8.php @@ -103,7 +103,7 @@ function exec_convert_utf8_dist() { @unlink(_DIR_SESSIONS.'convert_utf8_backup.sql'); // convertir spip_meta - $charset_source = lire_meta('conversion_charset'); + $charset_source = $GLOBALS['meta']['conversion_charset']; foreach ($GLOBALS['meta'] as $c => $v) { $v2 = unicode_to_utf_8(charset2unicode($v, $charset_source)); if ($v2 != $v) diff --git a/ecrire/inc/import.php b/ecrire/inc/import.php index e31018baa908fdea51d121ce3ec05bce9513cd75..13b727aea3544d650aee769b56f999fe3edcfcc6 100644 --- a/ecrire/inc/import.php +++ b/ecrire/inc/import.php @@ -234,7 +234,7 @@ function detruit_restaurateur() function affiche_progression_javascript($abs_pos,$table="") { global $affiche_progression_pourcent; - include_ecrire('inc_charsets'); + include_spip('inc/charsets'); if ($GLOBALS['flag_ob_flush']) ob_flush(); flush(); echo " -->\n<script type='text/javascript'><!--\n";