From bafef5e5d76acae7fab483d98d5913bd10b769de Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Mon, 12 Jun 2006 21:13:16 +0000
Subject: [PATCH] =?UTF-8?q?3=20occurrences=20de=20fonctions=20obsoletes.?=
=?UTF-8?q?=20Et=20les=20plugins=20obligent-ils=20vraiment=20=C3=A0=20dupl?=
=?UTF-8?q?iquer=20le=20code=20de=20init=5Fentete=20dans=20articles=5Forth?=
=?UTF-8?q?o=20=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/exec/articles_ortho.php | 2 +-
ecrire/exec/convert_utf8.php | 2 +-
ecrire/inc/import.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ecrire/exec/articles_ortho.php b/ecrire/exec/articles_ortho.php
index efd813ff3c..5f64593e15 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 d594b131cd..38d26cac63 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 e31018baa9..13b727aea3 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";
--
GitLab