Merge branch 'issue13'

afficher_diff/array_serialized.php

+<?php
+
+if (!defined('_ECRIRE_INC_VERSION')) {
+	return;
+}
+
+include_spip('inc/diff');
+
+/**
+ * Afficher le diff d'un tableaux serialize
+ *
+ * @param string $champ
+ * @param string $old
+ * @param string $new
+ * @param string $format
+ *   apercu, diff ou complet
+ * @return string
+ */
+function afficher_diff_array_serialized($champ, $old, $new, $format = 'diff') {
+	// Pour le diff de saisies, faire comme un diff de yaml
+	include_spip('inc/yaml');
+	$tenter_unserialize = charger_fonction('tenter_unserialize', 'filtre/');
+	$new = $tenter_unserialize($new);
+	$old = $tenter_unserialize($old);
+	if (is_array($new)) {
+		$new = yaml_encode($new);
+	} else {
+		$new = '';
+	}
+	if (is_array($old)) {
+		$old = yaml_encode($old);
+	} else {
+		$old = '';
+	}
+	$afficher_diff = charger_fonction('champ', 'afficher_diff', true);
+	return $afficher_diff($champ, $old, $new, 'complet');
+}
+
+

afficher_diff/formulaire_saisies.php

+<?php
+
+if (!defined('_ECRIRE_INC_VERSION')) {
+	return;
+}
+
+include_spip('inc/diff');
+
+/**
+ * Afficher le diff des saisies de formulaire
+ *
+ * @param string $champ
+ * @param string $old
+ * @param string $new
+ * @param string $format
+ *   apercu, diff ou complet
+ * @return string
+ */
+function afficher_diff_formulaire_saisies($champ, $old, $new, $format = 'diff') {
+	$afficher_diff = charger_fonction('array_serialized', 'afficher_diff', true);
+	return $afficher_diff($champ, $old, $new, 'complet');
+}
+
+

afficher_diff/formulaire_traitements.php

+<?php
+
+if (!defined('_ECRIRE_INC_VERSION')) {
+	return;
+}
+
+include_spip('inc/diff');
+
+/**
+ * Afficher le diff des saisies de formulaire
+ *
+ * @param string $champ
+ * @param string $old
+ * @param string $new
+ * @param string $format
+ *   apercu, diff ou complet
+ * @return string
+ */
+function afficher_diff_formulaire_traitements($champ, $old, $new, $format = 'diff') {
+	$afficher_diff = charger_fonction('array_serialized', 'afficher_diff', true);
+	return $afficher_diff($champ, $old, $new, 'complet');
+}
+
+

paquet.xml

 <paquet
 	prefix="formidable"
 	categorie="communication"
-	version="4.0.5"
+	version="4.0.6"
 	etat="stable"
 	compatibilite="[3.1.0;3.2.*]"
 	logo="images/formidable-64.png"