From 8dc139af9bed56a23fcf639a99ab3a0da7db8f08 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sat, 23 Sep 2006 21:18:01 +0000
Subject: [PATCH] =?UTF-8?q?Il=20y=20avait=20encore=20articles=5Fforum=20et?=
=?UTF-8?q?=20controle=5Fforum=20qui=20avaient=20le=20double=20statut=20fr?=
=?UTF-8?q?agment/complet.=20On=20traite=20le=20cas=20de=20mani=C3=A8re=20?=
=?UTF-8?q?g=C3=A9n=C3=A9rique=20au=20niveau=20de=20index,=20mais=20=C3=A7?=
=?UTF-8?q?a=20questionne=20sur=20le=20besoin=20du=20r=C3=A9pertoire=20fra?=
=?UTF-8?q?gments.=20Pas=20clair.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitattributes | 1 -
ecrire/fragments/calendrier.php | 21 ---------------------
ecrire/index.php | 3 ++-
3 files changed, 2 insertions(+), 23 deletions(-)
delete mode 100644 ecrire/fragments/calendrier.php
diff --git a/.gitattributes b/.gitattributes
index 2169963811..03b79231dc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -209,7 +209,6 @@ ecrire/exec/statistiques_svg.php -text
ecrire/exec/statistiques_visites.php -text
ecrire/exec/synchro.php -text
ecrire/exec/upgrade.php -text
-ecrire/fragments/calendrier.php -text
ecrire/fragments/dater.php -text
ecrire/fragments/discuter.php -text
ecrire/fragments/documenter.php -text
diff --git a/ecrire/fragments/calendrier.php b/ecrire/fragments/calendrier.php
deleted file mode 100644
index 78c8ef95c5..0000000000
--- a/ecrire/fragments/calendrier.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/***************************************************************************\
- * SPIP, Systeme de publication pour l'internet *
- * *
- * Copyright (c) 2001-2006 *
- * Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James *
- * *
- * Ce programme est un logiciel libre distribue sous licence GNU/GPL. *
- * Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
-\***************************************************************************/
-
-if (!defined("_ECRIRE_INC_VERSION")) return;
-
-# le calendrier parle aussi bien exec/ que fragments
-function fragments_calendrier_dist() {
- $f = charger_fonction('calendrier','exec');
- return $f();
-}
-
-?>
diff --git a/ecrire/index.php b/ecrire/index.php
index b6109d71a5..cbde4bf90e 100644
--- a/ecrire/index.php
+++ b/ecrire/index.php
@@ -163,7 +163,8 @@ if (isset($GLOBALS['_COOKIE']['spip_lang_ecrire'])) {
// le charset [utf-8] utilise par le client, utile a _request.
if (isset($var_ajaxcharset)) {
header("Content-Type: text/html; charset=".$GLOBALS['meta']["charset"]);
- $var_f = charger_fonction($exec, 'fragments');
+ $var_f = charger_fonction($exec, 'fragments', true);
+ if (!$var_f) $var_f = charger_fonction($exec, 'exec');
$fragment = $var_f();
echo "<","?xml version='1.0' encoding='",
$GLOBALS['meta']["charset"],"'?",">\n";
--
GitLab