From 4f7e97a9f19f2ff4ef775ba9502183611928abf4 Mon Sep 17 00:00:00 2001
From: Matthieu Marcillaud <marcimat@rezo.net>
Date: Fri, 4 Sep 2009 17:51:12 +0000
Subject: [PATCH] =?UTF-8?q?-=20changement=20pour=20la=20fonction=20journal?=
 =?UTF-8?q?(),=20on=20cr=C3=A9e=20la=20fonction=20comme=20spip=5Flog()=20d?=
 =?UTF-8?q?ans=20inc/utils?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecrire/inc/journal.php  | 2 +-
 ecrire/inc/modifier.php | 1 -
 ecrire/inc/utils.php    | 8 ++++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ecrire/inc/journal.php b/ecrire/inc/journal.php
index 5545ff7c49..5ceb2b9462 100644
--- a/ecrire/inc/journal.php
+++ b/ecrire/inc/journal.php
@@ -21,7 +21,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
  * @param string $journal
  * @param array $opt
  */
-function journal($phrase, $opt = array()) {
+function inc_journal_dist($phrase, $opt = array()) {
 	if (!strlen($phrase))
 		return;
 	if ($opt)
diff --git a/ecrire/inc/modifier.php b/ecrire/inc/modifier.php
index 19638ea929..aeb253e184 100644
--- a/ecrire/inc/modifier.php
+++ b/ecrire/inc/modifier.php
@@ -159,7 +159,6 @@ function modifier_contenu($type, $id, $options, $c=false, $serveur='') {
 
 	// journaliser l'affaire
 	// message a affiner :-)
-	include_spip('inc/journal');
 	include_spip('inc/filtres_mini');
 	$qui = sinon($GLOBALS['visiteur_session']['nom'], $GLOBALS['ip']);
 	journal(_L($qui.' a &#233;dit&#233; l&#8217;'.$type.' '.$id.' ('.join('+',array_diff(array_keys($champs), array('date_modif'))).')'), array(
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index 56ce24db69..9f2ca945b5 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -153,6 +153,14 @@ function spip_log($message, $logname=NULL, $logdir=NULL, $logsuf=NULL) {
 	$log( $message, $logname, $logdir, $logsuf);
 }
 
+//
+// Enregistrement des journaux
+//
+function journal($phrase, $opt = array()) {
+	$journal = charger_fonction('journal', 'inc');
+	$journal($phrase, $opt);
+}
+
 // Renvoie le _GET ou le _POST emis par l'utilisateur
 // ou pioche dans $c si c'est un array()
 // http://doc.spip.org/@_request
-- 
GitLab